From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Thu, 3 Jul 2014 08:43:09 +0000 (+0900)
Subject: intl: Sync up loadmsgcat.c with glibc
X-Git-Tag: v0.19.2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1ded6a9229c9be19836002dd5d92d610bee56dc;p=thirdparty%2Fgettext.git

intl: Sync up loadmsgcat.c with glibc

* loadmsgcat.c [_LIBC]: Define PRI_MACROS_BROKEN unconditionally.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index b78669707..ce9070269 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-03  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	intl: Sync up loadmsgcat.c with glibc
+	* loadmsgcat.c [_LIBC]: Define PRI_MACROS_BROKEN unconditionally.
+
 2014-07-03  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	intl: Sync up loadmsgcat.c with glibc
diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
index 826a5edae..570f47693 100644
--- a/gettext-runtime/intl/loadmsgcat.c
+++ b/gettext-runtime/intl/loadmsgcat.c
@@ -101,9 +101,7 @@ char *alloca ();
 #endif
 
 #ifdef _LIBC
-# ifndef PRI_MACROS_BROKEN
-#  define PRI_MACROS_BROKEN 0
-# endif
+# define PRI_MACROS_BROKEN 0
 #endif
 
 /* Provide fallback values for macros that ought to be defined in <inttypes.h>.