* lib/unistd.in.h (swab): Consider different declarations on Solaris,
HP-UX, and old mingw.
-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.
-
-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.
-
2021-06-19 Bruno Haible <bruno@clisp.org>
unistd: Improve conflict resolution between gnulib and textstyle.h.
# include <stddef.h>
# include <locale.h>
-# include "glthread/lock.h"
+# ifdef IN_LIBINTL
+# include "lock.h"
+# else
+# include "glthread/lock.h"
+# endif
struct locale_categories_names
{
#include <config.h>
/* Specification. */
-#include "localename.h"
+#ifdef IN_LIBINTL
+# include "gettextP.h"
+#else
+# include "localename.h"
+#endif
#include <limits.h>
#include <stdbool.h>
# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || (defined __linux__ && HAVE_LANGINFO_H) || defined __CYGWIN__
# include <langinfo.h>
# endif
-# include "glthread/lock.h"
+# if !defined IN_LIBINTL
+# include "glthread/lock.h"
+# endif
# if defined __sun
# if HAVE_GETLOCALENAME_L
/* Solaris >= 12. */
#if defined _WIN32 && !defined __CYGWIN__
# define WINDOWS_NATIVE
-# include "glthread/lock.h"
+# if !defined IN_LIBINTL
+# include "glthread/lock.h"
+# endif
#endif
#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
#include <stddef.h>
/* Get intmax_t. */
-#include <stdint.h>
+#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
/* malloc(), realloc(), free(). */
#include <stdlib.h>
#include <config.h>
/* Specification. */
-#include <search.h>
+#ifdef IN_LIBINTL
+# include "tsearch.h"
+#else
+# include <search.h>
+#endif
#include <stdlib.h>
# pragma GCC diagnostic ignored "-Wanalyzer-null-argument"
#endif
-#include <alloca.h>
+#ifndef IN_LIBINTL
+# include <alloca.h>
+#endif
/* Specification. */
#ifndef VASNPRINTF