From: Roland McGrath <roland@gnu.org>
Date: Thu, 1 Nov 2012 22:44:58 +0000 (+0000)
Subject: gold/
X-Git-Tag: cgen-snapshot-20121201~297
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2c9fdb45e95aeed8540383f14cad9a85a186b1b;p=thirdparty%2Fbinutils-gdb.git

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 176e1911c5c..edb103dc134 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 ce2d93979f6..3e6fe1d4cb1 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)