diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | m4/mbrtoc32.m4 | 4 | ||||
| -rw-r--r-- | m4/mbrtowc.m4 | 4 | ||||
| -rw-r--r-- | modules/c32isalnum | 5 | ||||
| -rw-r--r-- | modules/c32isalpha | 5 | ||||
| -rw-r--r-- | modules/c32isblank | 5 | ||||
| -rw-r--r-- | modules/c32iscntrl | 5 | ||||
| -rw-r--r-- | modules/c32isdigit | 5 | ||||
| -rw-r--r-- | modules/c32isgraph | 5 | ||||
| -rw-r--r-- | modules/c32islower | 5 | ||||
| -rw-r--r-- | modules/c32isprint | 5 | ||||
| -rw-r--r-- | modules/c32ispunct | 5 | ||||
| -rw-r--r-- | modules/c32isspace | 5 | ||||
| -rw-r--r-- | modules/c32isupper | 5 | ||||
| -rw-r--r-- | modules/c32isxdigit | 5 |
15 files changed, 83 insertions, 4 deletions
@@ -1,5 +1,24 @@ 2023-04-09 Bruno Haible <bruno@clisp.org> + c32is*: Ensure GNULIB_defined_mbstate_t is defined on AIX. + * m4/mbrtowc.m4 (gl_MBSTATE_T_BROKEN): Define through AC_DEFUN_ONCE. + * m4/mbrtoc32.m4 (gl_FUNC_MBRTOC32): Require it. + * modules/c32isalnum (Files): Add m4/mbrtowc.m4, m4/locale-ja.m4. + (configure.ac): Require gl_MBSTATE_T_BROKEN. + * modules/c32isalpha: Likewise. + * modules/c32isblank: Likewise. + * modules/c32iscntrl: Likewise. + * modules/c32isdigit: Likewise. + * modules/c32isgraph: Likewise. + * modules/c32islower: Likewise. + * modules/c32isprint: Likewise. + * modules/c32ispunct: Likewise. + * modules/c32isspace: Likewise. + * modules/c32isupper: Likewise. + * modules/c32isxdigit: Likewise. + +2023-04-09 Bruno Haible <bruno@clisp.org> + mbrtoc32: Add comments. * lib/mbrtoc32.c: Add comment regarding AIX. * m4/mbrtoc32.m4 (gl_FUNC_MBRTOC32): Add comment regarding diff --git a/m4/mbrtoc32.m4 b/m4/mbrtoc32.m4 index ed0234fbc0..b53636236c 100644 --- a/m4/mbrtoc32.m4 +++ b/m4/mbrtoc32.m4 @@ -1,4 +1,4 @@ -# mbrtoc32.m4 serial 13 +# mbrtoc32.m4 serial 14 dnl Copyright (C) 2014-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_MBRTOC32], dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is dnl determined. It describes how our overridden mbrtowc is implemented. dnl We then implement mbrtoc32 accordingly. - gl_MBSTATE_T_BROKEN + AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_TYPE_CHAR32_T]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 0c7a8bae69..893faff637 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,4 +1,4 @@ -# mbrtowc.m4 serial 39 -*- coding: utf-8 -*- +# mbrtowc.m4 serial 40 -*- coding: utf-8 -*- dnl Copyright (C) 2001-2002, 2004-2005, 2008-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -117,7 +117,7 @@ dnl Result is REPLACE_MBSTATE_T. dnl When this is set to 1, we replace both mbsinit() and mbrtowc(), in order to dnl avoid inconsistencies. -AC_DEFUN([gl_MBSTATE_T_BROKEN], +AC_DEFUN_ONCE([gl_MBSTATE_T_BROKEN], [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) diff --git a/modules/c32isalnum b/modules/c32isalnum index 41c8727f22..55719b534c 100644 --- a/modules/c32isalnum +++ b/modules/c32isalnum @@ -5,7 +5,9 @@ Files: lib/c32isalnum.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -20,6 +22,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32isalnum]) diff --git a/modules/c32isalpha b/modules/c32isalpha index 486b7cd0c5..cd33949d54 100644 --- a/modules/c32isalpha +++ b/modules/c32isalpha @@ -5,7 +5,9 @@ Files: lib/c32isalpha.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -20,6 +22,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32isalpha]) diff --git a/modules/c32isblank b/modules/c32isblank index f38de16016..b99f347074 100644 --- a/modules/c32isblank +++ b/modules/c32isblank @@ -5,7 +5,9 @@ Files: lib/c32isblank.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -21,6 +23,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32isblank]) diff --git a/modules/c32iscntrl b/modules/c32iscntrl index b7a15bcd5e..3b789e0f94 100644 --- a/modules/c32iscntrl +++ b/modules/c32iscntrl @@ -5,7 +5,9 @@ Files: lib/c32iscntrl.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -20,6 +22,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32iscntrl]) diff --git a/modules/c32isdigit b/modules/c32isdigit index 67c253ad25..823b1c8dac 100644 --- a/modules/c32isdigit +++ b/modules/c32isdigit @@ -5,7 +5,9 @@ Files: lib/c32isdigit.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -21,6 +23,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32isdigit]) diff --git a/modules/c32isgraph b/modules/c32isgraph index 39b7bfe817..e39affd97f 100644 --- a/modules/c32isgraph +++ b/modules/c32isgraph @@ -5,7 +5,9 @@ Files: lib/c32isgraph.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -20,6 +22,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32isgraph]) diff --git a/modules/c32islower b/modules/c32islower index c69cc49876..48c35548b1 100644 --- a/modules/c32islower +++ b/modules/c32islower @@ -5,7 +5,9 @@ Files: lib/c32islower.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -20,6 +22,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32islower]) diff --git a/modules/c32isprint b/modules/c32isprint index 6c147902c5..290ee094ae 100644 --- a/modules/c32isprint +++ b/modules/c32isprint @@ -5,7 +5,9 @@ Files: lib/c32isprint.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -20,6 +22,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32isprint]) diff --git a/modules/c32ispunct b/modules/c32ispunct index 932978c5a2..d828130fa2 100644 --- a/modules/c32ispunct +++ b/modules/c32ispunct @@ -6,7 +6,9 @@ Files: lib/c32ispunct.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -21,6 +23,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32ispunct]) diff --git a/modules/c32isspace b/modules/c32isspace index c1a3cd43ae..86132cecf2 100644 --- a/modules/c32isspace +++ b/modules/c32isspace @@ -5,7 +5,9 @@ Files: lib/c32isspace.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -20,6 +22,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32isspace]) diff --git a/modules/c32isupper b/modules/c32isupper index 7a51f1cf85..0efe245522 100644 --- a/modules/c32isupper +++ b/modules/c32isupper @@ -5,7 +5,9 @@ Files: lib/c32isupper.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -20,6 +22,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32isupper]) diff --git a/modules/c32isxdigit b/modules/c32isxdigit index e958285ee1..11616c2e71 100644 --- a/modules/c32isxdigit +++ b/modules/c32isxdigit @@ -6,7 +6,9 @@ Files: lib/c32isxdigit.c lib/c32is-impl.h m4/mbrtoc32.m4 +m4/mbrtowc.m4 m4/locale-fr.m4 +m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 @@ -22,6 +24,9 @@ assert-h configure.ac: AC_REQUIRE([gl_UCHAR_H]) +dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is +dnl determined. It describes how mbrtoc32 is implemented. +AC_REQUIRE([gl_MBSTATE_T_BROKEN]) AC_REQUIRE([gl_MBRTOC32_SANITYCHECK]) gl_UCHAR_MODULE_INDICATOR([c32isxdigit]) |