gold/

	* system.h: Move inclusion of <clocale> to after <libintl.h> in
	[ENABLE_NLS] section, and separately at top of [!ENABLE_NLS] section.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 176e1911c5c1ae5fb6bd252c1c28621a38c56eef..edb103dc1349e152a3168be38c16aad3d42c5530 100644 (file)
--- 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 ce2d93979f68d60725633ae826ca14bbaa9a5b20..3e6fe1d4cb16b6b8b2b28de7feb7f4e1d9d0dc26 100644 (file)
--- 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)