bug-gnulib@gnu.org mirror (unofficial)
 help / color / mirror / Atom feed
From: Bruno Haible <bruno@clisp.org>
To: bug-gnulib@gnu.org
Subject: sync with GNU gettext
Date: Sun, 20 Jun 2021 03:26:42 +0200	[thread overview]
Message-ID: <1874298.jdjunOyti0@omega> (raw)

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>
 



             reply	other threads:[~2021-06-20  1:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-20  1:26 Bruno Haible [this message]
2021-06-20 14:31 ` sync with GNU gettext Bruno Haible

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://lists.gnu.org/mailman/listinfo/bug-gnulib

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1874298.jdjunOyti0@omega \
    --to=bruno@clisp.org \
    --cc=bug-gnulib@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).