]> Savannah Git Hosting - gnulib.git/commitdiff
Revert two "Sync with GNU gettext" commits.
authorBruno Haible <bruno@clisp.org>
Sun, 11 Sep 2022 13:22:21 +0000 (15:22 +0200)
committerBruno Haible <bruno@clisp.org>
Sun, 11 Sep 2022 13:22:21 +0000 (15:22 +0200)
ChangeLog
lib/localename-table.h
lib/localename.c
lib/printf-parse.c
lib/tsearch.c
lib/vasnprintf.c

index bc3c9fb4de00d0f0d162037fde96216ae2145891..b7eac1b3e33610a4ba8ed4b873a94ffa7dc65b4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
        * lib/unistd.in.h (swab): Consider different declarations on Solaris,
        HP-UX, and old mingw.
 
-2021-06-20  Bruno Haible  <bruno@clisp.org>
-
-       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  <bruno@clisp.org>
-
-       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  <bruno@clisp.org>
 
        unistd: Improve conflict resolution between gnulib and textstyle.h.
index cfc297c112e5746746bcfc1ec69cb64c2d8e43db..0f4343d97dd80e9025a96bbe7e99476c5c5ba0ba 100644 (file)
 # include <stddef.h>
 # include <locale.h>
 
-# include "glthread/lock.h"
+# ifdef IN_LIBINTL
+#  include "lock.h"
+# else
+#  include "glthread/lock.h"
+# endif
 
 struct locale_categories_names
   {
index 446fc0333d5f5252eb7cc33cfa7cb8837e388088..d77bb8178b871e9b32ef751e5ca362234cd5c0d6 100644 (file)
 #include <config.h>
 
 /* Specification.  */
-#include "localename.h"
+#ifdef IN_LIBINTL
+# include "gettextP.h"
+#else
+# include "localename.h"
+#endif
 
 #include <limits.h>
 #include <stdbool.h>
@@ -42,7 +46,9 @@
 # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __linux__ && HAVE_LANGINFO_H) || defined __CYGWIN__
 #  include <langinfo.h>
 # 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 */
index aab02dc5bf25d7942f7edf2a45ed3d06fa461077..4814f87df747138d1215d833b5eb92cbac5b0781 100644 (file)
 #include <stddef.h>
 
 /* Get intmax_t.  */
-#include <stdint.h>
+#if defined IN_LIBINTL || defined IN_LIBASPRINTF
+# if HAVE_STDINT_H_WITH_UINTMAX
+#  include <stdint.h>
+# endif
+# if HAVE_INTTYPES_H_WITH_UINTMAX
+#  include <inttypes.h>
+# endif
+#else
+# include <stdint.h>
+#endif
 
 /* malloc(), realloc(), free().  */
 #include <stdlib.h>
index 1ead2ad7fe0a3d3f2fd814b51daf7691a797d554..7714da0c9ee705ec59b851b4ff153052c5d3f18f 100644 (file)
 #include <config.h>
 
 /* Specification.  */
-#include <search.h>
+#ifdef IN_LIBINTL
+# include "tsearch.h"
+#else
+# include <search.h>
+#endif
 
 #include <stdlib.h>
 
index 485745243fbba8c9cf025ba5d9cd7e0cb04e34c5..18e770b0188e98c12a350590c72b11daa8463fb5 100644 (file)
@@ -68,7 +68,9 @@
 # pragma GCC diagnostic ignored "-Wanalyzer-null-argument"
 #endif
 
-#include <alloca.h>
+#ifndef IN_LIBINTL
+# include <alloca.h>
+#endif
 
 /* Specification.  */
 #ifndef VASNPRINTF