darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gold/

Browse source 
* system.h: Move inclusion of <clocale> to after <libintl.h> in
	[ENABLE_NLS] section, and separately at top of [!ENABLE_NLS] section.
This commit is contained in:
Roland McGrath 2012-11-01 22:44:58 +00:00
parent 3e536b9a7a
commit c2c9fdb45e
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gold/ChangeLog
View file

@ -8,6 +8,9 @@
2012-11-01 Roland McGrath <mcgrathr@google.com> 2012-11-01 Roland McGrath <mcgrathr@google.com>
* system.h: Move inclusion of <clocale> to after <libintl.h> in
[ENABLE_NLS] section, and separately at top of [!ENABLE_NLS] section.
* nacl.cc: Include "libiberty.h" for vasprintf declaration. * nacl.cc: Include "libiberty.h" for vasprintf declaration.
2012-11-01 Roland McGrath <mcgrathr@google.com> 2012-11-01 Roland McGrath <mcgrathr@google.com>

8
gold/system.h
View file

@ -33,12 +33,10 @@
# define _LIBGETTEXT_H # define _LIBGETTEXT_H
#endif #endif
// Always include <clocale> first to avoid conflicts with the macros
// used when ENABLE_NLS is not defined.
#include <clocale>
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
// On some systems, things go awry when <libintl.h> comes after <clocale>.
# include <libintl.h> # include <libintl.h>
# include <clocale>
# define _(String) gettext (String) # define _(String) gettext (String)
# ifdef gettext_noop # ifdef gettext_noop
# define N_(String) gettext_noop (String) # define N_(String) gettext_noop (String)
@ -46,6 +44,8 @@
# define N_(String) (String) # define N_(String) (String)
# endif # endif
#else #else
// Include <clocale> first to avoid conflicts with these macros.
# include <clocale>
# define gettext(Msgid) (Msgid) # define gettext(Msgid) (Msgid)
# define dgettext(Domainname, Msgid) (Msgid) # define dgettext(Domainname, Msgid) (Msgid)
# define dcgettext(Domainname, Msgid, Category) (Msgid) # define dcgettext(Domainname, Msgid, Category) (Msgid)