]> Savannah Git Hosting - gnulib.git/commitdiff
wchar: Make the HP-UX workaround work on HP-UX 11.31.
authorBruno Haible <bruno@clisp.org>
Thu, 2 Jan 2020 12:56:23 +0000 (13:56 +0100)
committerBruno Haible <bruno@clisp.org>
Thu, 2 Jan 2020 12:56:23 +0000 (13:56 +0100)
* modules/wchar (Depends-on): Add inttypes-incomplete.
* lib/inttypes.in.h: Define _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H.
* lib/wchar.in.h: Test _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H instead
of strtoimax.

ChangeLog
lib/inttypes.in.h
lib/wchar.in.h
modules/wchar

index 920367591f39445e4185e8bf1fa8e1243ad4c1d6..e3c40d7f19270f890b412387bf7556dba4152719 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-01-02  Bruno Haible  <bruno@clisp.org>
+
+       wchar: Make the HP-UX workaround work on HP-UX 11.31.
+       * modules/wchar (Depends-on): Add inttypes-incomplete.
+       * lib/inttypes.in.h: Define _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H.
+       * lib/wchar.in.h: Test _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H instead
+       of strtoimax.
+
 2020-01-02  Bruno Haible  <bruno@clisp.org>
 
        mbrtowc: Fix compilation error on IRIX (regression from 2019-12-26).
index 5184e266f27fdb5ceac12e74630f7ccde216b37b..d6efc7eeeef0f0c0f447841c8f2aa297401610e9 100644 (file)
@@ -38,6 +38,8 @@
 #  endif
 
 #  @INCLUDE_NEXT@ @NEXT_INTTYPES_H@
+
+#  define _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H
 # endif
 #endif
 
index 3eaa7a625d717e4193e217a6c60aebd81ad68058..834b3e81f797360bb49152eafda6a3fcae707e8a 100644 (file)
@@ -33,7 +33,8 @@
 #if (((defined __need_mbstate_t || defined __need_wint_t)               \
       && !defined __MINGW32__)                                          \
      || (defined __hpux                                                 \
-         && ((defined _INTTYPES_INCLUDED && !defined strtoimax)         \
+         && ((defined _INTTYPES_INCLUDED                                \
+              && !defined _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H)     \
              || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H))               \
      || (defined __MINGW32__ && defined __STRING_H_SOURCED__)           \
      || defined _GL_ALREADY_INCLUDING_WCHAR_H)
index a943740a91201281f53955672bc3584475f6ba50..cd4464b069a9b2cc039177def7bfbbc5f46bc7cd 100644 (file)
@@ -12,6 +12,7 @@ include_next
 snippet/arg-nonnull
 snippet/c++defs
 snippet/warn-on-use
+inttypes-incomplete
 stddef
 
 configure.ac: