aboutsummaryrefslogtreecommitdiff
path: root/gold
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2012-11-01 22:44:58 +0000
committerRoland McGrath <roland@gnu.org>2012-11-01 22:44:58 +0000
commitc2c9fdb45e95aeed8540383f14cad9a85a186b1b (patch)
treef7442353a0741de1b5a4d7bd9139a78147ffd185 /gold
parent3e536b9a7a315d2eec69ff06ff9bb678aad66660 (diff)
downloadgdb-c2c9fdb45e95aeed8540383f14cad9a85a186b1b.zip
gdb-c2c9fdb45e95aeed8540383f14cad9a85a186b1b.tar.gz
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')
-rw-r--r--gold/ChangeLog3
-rw-r--r--gold/system.h8
2 files changed, 7 insertions, 4 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 176e191..edb103d 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -8,6 +8,9 @@
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.
2012-11-01 Roland McGrath <mcgrathr@google.com>
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)