From e50ff28661d748f1c571d89ffd10ebe58eb78569 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 7 Nov 2010 13:51:09 +0100 Subject: [PATCH] Rename libgnuintl.h.in to libgnuintl.in.h. --- gettext-runtime/intl/ChangeLog | 7 +++++++ gettext-runtime/intl/Makefile.in | 10 +++++----- .../intl/{libgnuintl.h.in => libgnuintl.in.h} | 0 gettext-runtime/intl/printf.c | 4 ++-- 4 files changed, 14 insertions(+), 7 deletions(-) rename gettext-runtime/intl/{libgnuintl.h.in => libgnuintl.in.h} (100%) diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 728f38560..d021ef51a 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,10 @@ +2010-11-07 Bruno Haible + + Rename libgnuintl.h.in to libgnuintl.in.h. + * libgnuintl.in.h: New file, renamed from libgnuintl.h.in. + * Makefile.in (HEADERS, libgnuintl.h, libintl.h): Update. + * printf.c: Update. + 2010-10-14 Bruno Haible vasnprintf: Don't set errno to 0. diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in index 2e53ccca0..62ac4b7f4 100644 --- a/gettext-runtime/intl/Makefile.in +++ b/gettext-runtime/intl/Makefile.in @@ -130,7 +130,7 @@ HEADERS = \ printf-parse.h wprintf-parse.h printf-parse.c \ vasnprintf.h vasnwprintf.h vasnprintf.c \ os2compat.h \ - libgnuintl.h.in + libgnuintl.in.h SOURCES = \ bindtextdom.c \ dcgettext.c \ @@ -341,14 +341,14 @@ ref-del.sed: $(srcdir)/ref-del.sin INCLUDES = -I. -I$(srcdir) -I.. -libgnuintl.h: $(srcdir)/libgnuintl.h.in +libgnuintl.h: $(srcdir)/libgnuintl.in.h sed -e '/IN_LIBGLOCALE/d' \ -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \ -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ - < $(srcdir)/libgnuintl.h.in \ + < $(srcdir)/libgnuintl.in.h \ | if test '@WOE32DLL@' = yes; then \ sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \ else \ @@ -359,14 +359,14 @@ libgnuintl.h: $(srcdir)/libgnuintl.h.in | sed -e 's,@''HAVE_VISIBILITY''@,@HAVE_VISIBILITY@,g' \ > libgnuintl.h -libintl.h: $(srcdir)/libgnuintl.h.in +libintl.h: $(srcdir)/libgnuintl.in.h sed -e '/IN_LIBGLOCALE/d' \ -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \ -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \ -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \ -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \ -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \ - < $(srcdir)/libgnuintl.h.in > libintl.h + < $(srcdir)/libgnuintl.in.h > libintl.h charset.alias: $(srcdir)/config.charset $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ diff --git a/gettext-runtime/intl/libgnuintl.h.in b/gettext-runtime/intl/libgnuintl.in.h similarity index 100% rename from gettext-runtime/intl/libgnuintl.h.in rename to gettext-runtime/intl/libgnuintl.in.h diff --git a/gettext-runtime/intl/printf.c b/gettext-runtime/intl/printf.c index b7cdc5d82..e86245d5a 100644 --- a/gettext-runtime/intl/printf.c +++ b/gettext-runtime/intl/printf.c @@ -1,5 +1,5 @@ /* Formatted output to strings, using POSIX/XSI format strings with positions. - Copyright (C) 2003, 2006-2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2010 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify it @@ -70,7 +70,7 @@ char *alloca (); #define STATIC static -/* This needs to be consistent with libgnuintl.h.in. */ +/* This needs to be consistent with libgnuintl.in.h. */ #if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__ /* Don't break __attribute__((format(printf,M,N))). This redefinition is only possible because the libc in NetBSD, Cygwin, -- 2.47.2