From 5d357603e8ecd6a256a9b8a34292b3dc7ebec4d4 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 20 Jun 2021 16:29:39 +0200 Subject: [PATCH] Sync with GNU gettext. * lib/printf-parse.c: Ignore IN_LIBINTL and IN_LIBASPRINTF. * lib/vasnprintf.c: Ignore IN_LIBINTL. --- ChangeLog | 6 ++++++ lib/printf-parse.c | 11 +---------- lib/vasnprintf.c | 4 +--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3939963d53..5fc5907aae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-06-20 Bruno Haible + + Sync with GNU gettext. + * lib/printf-parse.c: Ignore IN_LIBINTL and IN_LIBASPRINTF. + * lib/vasnprintf.c: Ignore IN_LIBINTL. + 2021-06-19 Bruno Haible Sync with GNU gettext. diff --git a/lib/printf-parse.c b/lib/printf-parse.c index d9dd6e01c9..f21cc17c0b 100644 --- a/lib/printf-parse.c +++ b/lib/printf-parse.c @@ -48,16 +48,7 @@ #include /* Get intmax_t. */ -#if defined IN_LIBINTL || defined IN_LIBASPRINTF -# if HAVE_STDINT_H_WITH_UINTMAX -# include -# endif -# if HAVE_INTTYPES_H_WITH_UINTMAX -# include -# endif -#else -# include -#endif +#include /* malloc(), realloc(), free(). */ #include diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index 089c113533..12c532ef46 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -60,9 +60,7 @@ #ifndef VASNPRINTF # include #endif -#ifndef IN_LIBINTL -# include -#endif +#include /* Specification. */ #ifndef VASNPRINTF -- 2.39.5