From a71e15d8698b774b5b2024a805cf6bea242c2f96 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 2 Jan 2020 13:56:23 +0100 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ lib/inttypes.in.h | 2 ++ lib/wchar.in.h | 3 ++- modules/wchar | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 920367591f..e3c40d7f19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-01-02 Bruno Haible + + 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 mbrtowc: Fix compilation error on IRIX (regression from 2019-12-26). diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index 5184e266f2..d6efc7eeee 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -38,6 +38,8 @@ # endif # @INCLUDE_NEXT@ @NEXT_INTTYPES_H@ + +# define _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H # endif #endif diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 3eaa7a625d..834b3e81f7 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -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) diff --git a/modules/wchar b/modules/wchar index a943740a91..cd4464b069 100644 --- a/modules/wchar +++ b/modules/wchar @@ -12,6 +12,7 @@ include_next snippet/arg-nonnull snippet/c++defs snippet/warn-on-use +inttypes-incomplete stddef configure.ac: -- 2.39.5