From: Roland McGrath <roland@gnu.org>
Date: Wed, 7 Nov 2012 17:33:49 +0000 (+0000)
Subject: gold/
X-Git-Tag: binutils-2_23_1~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=823b693056c628b65c5fa6927a6adf6c147ba391;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 f51dfeb7974..efe9e62204f 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,8 @@
 2012-11-07  Roland McGrath  <mcgrathr@google.com>
 
+	* gold.h: Move inclusion of <clocale> to after <libintl.h> in
+	[ENABLE_NLS] section, and separately at top of [!ENABLE_NLS] section.
+
 	* descriptors.cc (set_close_on_exec): Add ATTRIBUTE_UNUSED to the
 	parameter, which is unused in the [!F_SETFD] case.
 
diff --git a/gold/gold.h b/gold/gold.h
index 9aa7cf3506c..df7414c4f1d 100644
--- a/gold/gold.h
+++ b/gold/gold.h
@@ -42,12 +42,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)
@@ -55,6 +53,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)