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 b78669707ec9d9f7b65a8be9071ad860c26206e9..ce9070269e62c07f4cb5925f611d754ce74d8692 100644 (file)
--- 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 826a5edae3fc4743bc5c110ba936d6c9694025fc..570f47693a326bc80bc6ffa35d7b60cf99378778 100644 (file)
--- 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>.