Re: [bug-gettext] [PATCH] Sync up loadmsgcat.c with glibc

[Siddhesh Poyarekar]

On Thu, Jul 03, 2014 at 05:27:24PM +0900, Daiki Ueno wrote:
> Siddhesh Poyarekar <address@hidden> writes:
> 
> > I am trying to sync up loadmsgcat.c between gettext and glibc.
> 
> Thanks for working on that.
> 
> > The glibc bits have gone in[1][2] already and these are bits from the
> > glibc version that can go into gettext as improvements.  Do they look
> > OK for gettext?
> 
> Looks good to me.  Pushed:
> http://git.savannah.gnu.org/cgit/gettext.git/commit/?h=maint&id=b0ca3de6
> 

Thanks.  The last email I sent had a slightly different patch based on
review of the glibc bits.  I forgot to mention that detail when I sent
it, sorry about that.  Here's an incremental change on top of current
master.

Siddhesh

        * gettext-runtime/intl/loadmsgcat.c [_LIBC]: Define
        PRI_MACROS_BROKEN unconditionally.

diff --git a/gettext-runtime/intl/loadmsgcat.c 
b/gettext-runtime/intl/loadmsgcat.c
index 826a5ed..570f476 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>.

pgp5qaahbZdQV.pgp
Description: PGP signature