sync with GNU gettext

sync with GNU gettext

[Bruno Haible]

Here are small changes, to be in sync with the changed build system of
GNU gettext that makes more use of Gnulib now, thus reducing the
need for IN_LIBINTL conditionals.


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.

diff --git a/lib/localename-table.h b/lib/localename-table.h
index f365b24..98f5b9f 100644
--- a/lib/localename-table.h
+++ b/lib/localename-table.h
@@ -21,11 +21,7 @@
 # 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
   {
diff --git a/lib/localename.c b/lib/localename.c
index d47dd2f..5ee6764 100644
--- a/lib/localename.c
+++ b/lib/localename.c
@@ -21,11 +21,7 @@
 #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 */
diff --git a/lib/tsearch.c b/lib/tsearch.c
index 0d4d838..65d902e 100644
--- a/lib/tsearch.c
+++ b/lib/tsearch.c
@@ -92,11 +92,7 @@
 #include <config.h>
 
 /* Specification.  */
-#ifdef IN_LIBINTL
-# include "tsearch.h"
-#else
-# include <search.h>
-#endif
+#include <search.h>
 
 #include <stdlib.h>
 

Re: sync with GNU gettext

[Bruno Haible]

> 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.

Some more simplifications of the same kind:


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.

diff --git a/lib/printf-parse.c b/lib/printf-parse.c
index d9dd6e0..f21cc17 100644
--- a/lib/printf-parse.c
+++ b/lib/printf-parse.c
@@ -48,16 +48,7 @@
 #include <stddef.h>
 
 /* Get intmax_t.  */
-#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
+#include <stdint.h>
 
 /* malloc(), realloc(), free().  */
 #include <stdlib.h>
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 089c113..12c532e 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -60,9 +60,7 @@
 #ifndef VASNPRINTF
 # include <config.h>
 #endif
-#ifndef IN_LIBINTL
-# include <alloca.h>
-#endif
+#include <alloca.h>
 
 /* Specification.  */
 #ifndef VASNPRINTF