From 40bd925e525fc9d7302ceaa1d53136f2568865ee Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 1 Sep 2024 00:12:54 +0200 Subject: [PATCH] iswxdigit: Work around OpenBSD, Android, Haiku bug. * m4/iswxdigit.m4 (gl_FUNC_ISWXDIGIT): Require gt_LOCALE_EN_UTF8 instead of gt_LOCALE_FR_UTF8. Use LOCALE_EN_UTF8 instead of LOCALE_FR_UTF8. Update cross-compilation guess. * modules/iswxdigit (Files): Add m4/locale-en.m4. Remove m4/locale-fr.m4. * doc/posix-functions/iswxdigit.texi: Update list of platforms. --- ChangeLog | 9 +++++++++ doc/posix-functions/iswxdigit.texi | 2 +- m4/iswxdigit.m4 | 18 +++++++++--------- modules/iswxdigit | 2 +- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0889972206..76abb6ff66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2024-08-31 Bruno Haible + + iswxdigit: Work around OpenBSD, Android, Haiku bug. + * m4/iswxdigit.m4 (gl_FUNC_ISWXDIGIT): Require gt_LOCALE_EN_UTF8 instead + of gt_LOCALE_FR_UTF8. Use LOCALE_EN_UTF8 instead of LOCALE_FR_UTF8. + Update cross-compilation guess. + * modules/iswxdigit (Files): Add m4/locale-en.m4. Remove m4/locale-fr.m4. + * doc/posix-functions/iswxdigit.texi: Update list of platforms. + 2024-08-31 Bruno Haible iswdigit: Work around OpenBSD, Android, Haiku bug. diff --git a/doc/posix-functions/iswxdigit.texi b/doc/posix-functions/iswxdigit.texi index 4bbc7e1583..7c08df9f9c 100644 --- a/doc/posix-functions/iswxdigit.texi +++ b/doc/posix-functions/iswxdigit.texi @@ -17,7 +17,7 @@ on some platforms: macOS 10.8. @item This function is not ISO C 99 compliant on some platforms: -FreeBSD 14.0, NetBSD 10.0, Solaris 11.4, MSVC 14. +FreeBSD 14.0, NetBSD 10.0, OpenBSD 7.5, Solaris 11.4, MSVC 14, Haiku, Android. @end itemize Portability problems not fixed by Gnulib: diff --git a/m4/iswxdigit.m4 b/m4/iswxdigit.m4 index 6085bf6b01..1a8e57b0a2 100644 --- a/m4/iswxdigit.m4 +++ b/m4/iswxdigit.m4 @@ -1,5 +1,5 @@ # iswxdigit.m4 -# serial 7 +# serial 9 dnl Copyright (C) 2020-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_ISWXDIGIT], AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) AC_REQUIRE([gl_WCTYPE_H]) AC_REQUIRE([gt_LOCALE_JA]) - AC_REQUIRE([gt_LOCALE_FR_UTF8]) + AC_REQUIRE([gt_LOCALE_EN_UTF8]) AC_REQUIRE([gt_LOCALE_ZH_CN]) AC_REQUIRE([AC_CANONICAL_HOST]) @@ -25,14 +25,14 @@ AC_DEFUN([gl_FUNC_ISWXDIGIT], dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on FreeBSD, NetBSD, Solaris, native Windows. - freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*) + # Guess no on FreeBSD, NetBSD, OpenBSD, Solaris, native Windows, Haiku, Android. + freebsd* | dragonfly* | netbsd* | openbsd* | solaris* | mingw* | windows* | haiku* | *-android*) gl_cv_func_iswxdigit_works="guessing no" ;; # Guess yes otherwise. *) gl_cv_func_iswxdigit_works="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_JA != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_ZH_CN != none; then + if test $LOCALE_JA != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_ZH_CN != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include @@ -73,15 +73,15 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 1; } - if (strcmp ("$LOCALE_FR_UTF8", "none") != 0 - && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) + if (strcmp ("$LOCALE_EN_UTF8", "none") != 0 + && setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL) { - /* This fails on FreeBSD 13.0. */ + /* This fails on FreeBSD 13.0, Haiku, Android. */ /* U+0663 ARABIC-INDIC DIGIT THREE */ is = for_character ("\331\243", 2); if (!(is == 0)) result |= 2; - /* This fails on NetBSD 10.0, MSVC 14. */ + /* This fails on NetBSD 10.0, OpenBSD 7.5, MSVC 14, Haiku, Android. */ /* U+FF21 FULLWIDTH LATIN CAPITAL LETTER A */ is = for_character ("\357\274\241", 3); if (!(is == 0)) diff --git a/modules/iswxdigit b/modules/iswxdigit index 9261524c6e..a0cb6c5945 100644 --- a/modules/iswxdigit +++ b/modules/iswxdigit @@ -4,7 +4,7 @@ iswxdigit() function: test wide character for being a hexadecimal digit. Files: lib/iswxdigit.c m4/iswxdigit.m4 -m4/locale-fr.m4 +m4/locale-en.m4 m4/locale-ja.m4 m4/locale-zh.m4 m4/codeset.m4 -- 2.39.5