From dc631883e47212d5cd311575b491cb5b093b34d9 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 11 Sep 2022 15:22:21 +0200 Subject: [PATCH] Revert two "Sync with GNU gettext" commits. --- ChangeLog | 13 ------------- lib/localename-table.h | 6 +++++- lib/localename.c | 14 +++++++++++--- lib/printf-parse.c | 11 ++++++++++- lib/tsearch.c | 6 +++++- lib/vasnprintf.c | 4 +++- 6 files changed, 34 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc3c9fb4de..b7eac1b3e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4612,19 +4612,6 @@ * lib/unistd.in.h (swab): Consider different declarations on Solaris, HP-UX, and old mingw. -2021-06-20 Bruno Haible - - Sync with GNU gettext. - * lib/printf-parse.c: Ignore IN_LIBINTL and IN_LIBASPRINTF. - * lib/vasnprintf.c: Ignore IN_LIBINTL. - -2021-06-19 Bruno Haible - - Sync with GNU gettext. - * lib/tsearch.c: Ignore IN_LIBINTL. - * lib/localename-table.h: Likewise. - * lib/localename.c: Ignore IN_LIBINTL in some places. - 2021-06-19 Bruno Haible unistd: Improve conflict resolution between gnulib and textstyle.h. diff --git a/lib/localename-table.h b/lib/localename-table.h index cfc297c112..0f4343d97d 100644 --- a/lib/localename-table.h +++ b/lib/localename-table.h @@ -21,7 +21,11 @@ # include # include -# include "glthread/lock.h" +# ifdef IN_LIBINTL +# include "lock.h" +# else +# include "glthread/lock.h" +# endif struct locale_categories_names { diff --git a/lib/localename.c b/lib/localename.c index 446fc0333d..d77bb8178b 100644 --- a/lib/localename.c +++ b/lib/localename.c @@ -21,7 +21,11 @@ #include /* Specification. */ -#include "localename.h" +#ifdef IN_LIBINTL +# include "gettextP.h" +#else +# include "localename.h" +#endif #include #include @@ -42,7 +46,9 @@ # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __linux__ && HAVE_LANGINFO_H) || defined __CYGWIN__ # include # endif -# include "glthread/lock.h" +# if !defined IN_LIBINTL +# include "glthread/lock.h" +# endif # if defined __sun # if HAVE_GETLOCALENAME_L /* Solaris >= 12. */ @@ -63,7 +69,9 @@ extern char * getlocalename_l(int, locale_t); #if defined _WIN32 && !defined __CYGWIN__ # define WINDOWS_NATIVE -# include "glthread/lock.h" +# if !defined IN_LIBINTL +# include "glthread/lock.h" +# endif #endif #if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */ diff --git a/lib/printf-parse.c b/lib/printf-parse.c index aab02dc5bf..4814f87df7 100644 --- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -48,7 +48,16 @@ #include /* Get intmax_t. */ -#include +#if defined IN_LIBINTL || defined IN_LIBASPRINTF +# if HAVE_STDINT_H_WITH_UINTMAX +# include +# endif +# if HAVE_INTTYPES_H_WITH_UINTMAX +# include +# endif +#else +# include +#endif /* malloc(), realloc(), free(). */ #include diff --git a/lib/tsearch.c b/lib/tsearch.c index 1ead2ad7fe..7714da0c9e 100644 --- a/lib/tsearch.c +++ b/lib/tsearch.c @@ -92,7 +92,11 @@ #include /* Specification. */ -#include +#ifdef IN_LIBINTL +# include "tsearch.h" +#else +# include +#endif #include diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 485745243f..18e770b018 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -68,7 +68,9 @@ # pragma GCC diagnostic ignored "-Wanalyzer-null-argument" #endif -#include +#ifndef IN_LIBINTL +# include +#endif /* Specification. */ #ifndef VASNPRINTF -- 2.39.5