diff options
author | Roland McGrath <roland@gnu.org> | 2012-11-01 22:44:58 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2012-11-01 22:44:58 +0000 |
commit | c2c9fdb45e95aeed8540383f14cad9a85a186b1b (patch) | |
tree | f7442353a0741de1b5a4d7bd9139a78147ffd185 /gold/system.h | |
parent | 3e536b9a7a315d2eec69ff06ff9bb678aad66660 (diff) | |
download | fsf-binutils-gdb-c2c9fdb45e95aeed8540383f14cad9a85a186b1b.zip fsf-binutils-gdb-c2c9fdb45e95aeed8540383f14cad9a85a186b1b.tar.gz fsf-binutils-gdb-c2c9fdb45e95aeed8540383f14cad9a85a186b1b.tar.bz2 |
gold/
* system.h: Move inclusion of <clocale> to after <libintl.h> in
[ENABLE_NLS] section, and separately at top of [!ENABLE_NLS] section.
Diffstat (limited to 'gold/system.h')
-rw-r--r-- | gold/system.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gold/system.h b/gold/system.h index ce2d939..3e6fe1d 100644 --- a/gold/system.h +++ b/gold/system.h @@ -33,12 +33,10 @@ # define _LIBGETTEXT_H #endif -// Always include <clocale> first to avoid conflicts with the macros -// used when ENABLE_NLS is not defined. -#include <clocale> - #ifdef ENABLE_NLS +// On some systems, things go awry when <libintl.h> comes after <clocale>. # include <libintl.h> +# include <clocale> # define _(String) gettext (String) # ifdef gettext_noop # define N_(String) gettext_noop (String) @@ -46,6 +44,8 @@ # define N_(String) (String) # endif #else +// Include <clocale> first to avoid conflicts with these macros. +# include <clocale> # define gettext(Msgid) (Msgid) # define dgettext(Domainname, Msgid) (Msgid) # define dcgettext(Domainname, Msgid, Category) (Msgid) |