From: Bruno Haible <bruno@clisp.org>
To: bug-gnulib@gnu.org
Subject: Re: sync with GNU gettext
Date: Sun, 20 Jun 2021 16:31:40 +0200 [thread overview]
Message-ID: <6372564.xzthJLXbDh@omega> (raw)
In-Reply-To: <1874298.jdjunOyti0@omega>
> 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
prev parent reply other threads:[~2021-06-20 14:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-20 1:26 sync with GNU gettext Bruno Haible
2021-06-20 14:31 ` Bruno Haible [this message]
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=6372564.xzthJLXbDh@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).