From: Bruno Haible Date: Sun, 20 Jun 2021 01:25:53 +0000 (+0200) Subject: Sync with GNU gettext. X-Git-Tag: v1.0~2798 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=28e9b735a9d74f63ed7c23c8eeac040242bc0b0a;p=gnulib.git 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/ChangeLog b/ChangeLog index da5b6316af..3939963d53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +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 f365b24664..98f5b9f943 100644 --- a/lib/localename-table.h +++ b/lib/localename-table.h @@ -21,11 +21,7 @@ # include # include -# 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 d47dd2fc8b..5ee676431a 100644 --- a/lib/localename.c +++ b/lib/localename.c @@ -21,11 +21,7 @@ #include /* Specification. */ -#ifdef IN_LIBINTL -# include "gettextP.h" -#else -# include "localename.h" -#endif +#include "localename.h" #include #include @@ -46,9 +42,7 @@ # if (__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __linux__ && HAVE_LANGINFO_H) || defined __CYGWIN__ # include # 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 0d4d8380d6..65d902ebb9 100644 --- a/lib/tsearch.c +++ b/lib/tsearch.c @@ -92,11 +92,7 @@ #include /* Specification. */ -#ifdef IN_LIBINTL -# include "tsearch.h" -#else -# include -#endif +#include #include