[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
sync with GNU gettext
From: |
Bruno Haible |
Subject: |
sync with GNU gettext |
Date: |
Sun, 20 Jun 2021 03:26:42 +0200 |
User-agent: |
KMail/5.1.3 (Linux/4.4.0-210-generic; KDE/5.18.0; x86_64; ; ) |
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>
- sync with GNU gettext,
Bruno Haible <=