]> Savannah Git Hosting - gnulib.git/commitdiff
Sync with GNU gettext.
authorBruno Haible <bruno@clisp.org>
Sun, 20 Jun 2021 01:25:53 +0000 (03:25 +0200)
committerBruno Haible <bruno@clisp.org>
Sun, 20 Jun 2021 01:25:53 +0000 (03:25 +0200)
* lib/tsearch.c: Ignore IN_LIBINTL.
* lib/localename-table.h: Likewise.
* lib/localename.c: Ignore IN_LIBINTL in some places.

ChangeLog
lib/localename-table.h
lib/localename.c
lib/tsearch.c

index da5b6316af01f453320d99c174473a63bca01565..3939963d5374fb84fdae0302937b020ef6407327 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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 f365b246644bac411b22f85c7fb431710086647b..98f5b9f94330c4440d44cda46b04af3be4192e82 100644 (file)
 # include <stddef.h>
 # include <locale.h>
 
-# ifdef IN_LIBINTL
-#  include "lock.h"
-# else
-#  include "glthread/lock.h"
-# endif
+# include "glthread/lock.h"
 
 struct locale_categories_names
   {
index d47dd2fc8b5533948a0a69442c46847ea54efab8..5ee676431a66f066128c840818b48b3d48331282 100644 (file)
 #include <config.h>
 
 /* Specification.  */
-#ifdef IN_LIBINTL
-# include "gettextP.h"
-#else
-# include "localename.h"
-#endif
+#include "localename.h"
 
 #include <limits.h>
 #include <stdbool.h>
@@ -46,9 +42,7 @@
 # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __linux__ && HAVE_LANGINFO_H) || defined __CYGWIN__
 #  include <langinfo.h>
 # endif
-# if !defined IN_LIBINTL
-#  include "glthread/lock.h"
-# endif
+# include "glthread/lock.h"
 # if defined __sun
 #  if HAVE_GETLOCALENAME_L
 /* Solaris >= 12.  */
@@ -69,9 +63,7 @@ extern char * getlocalename_l(int, locale_t);
 
 #if defined _WIN32 && !defined __CYGWIN__
 # define WINDOWS_NATIVE
-# if !defined IN_LIBINTL
-#  include "glthread/lock.h"
-# endif
+# include "glthread/lock.h"
 #endif
 
 #if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
index 0d4d8380d61531f4cbe40c26a432bd2bc0baa708..65d902ebb9773ca7b8a5c91b5d7de3ab2e5ba0ff 100644 (file)
 #include <config.h>
 
 /* Specification.  */
-#ifdef IN_LIBINTL
-# include "tsearch.h"
-#else
-# include <search.h>
-#endif
+#include <search.h>
 
 #include <stdlib.h>