+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.
#include <config.h>
/* Specification. */
-#ifdef IN_LIBINTL
-# include "gettextP.h"
-#else
-# include "localename.h"
-#endif
+#include "localename.h"
#include <limits.h>
#include <stdbool.h>
# 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. */
#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 */