From fe4d6c37e4f08cfcd44f55e8e9e769328eebfd4e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 1 Sep 2024 00:11:12 +0200 Subject: [PATCH] iswdigit: Work around OpenBSD, Android, Haiku bug. * m4/iswdigit.m4 (gl_FUNC_ISWDIGIT): 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/iswdigit (Files): Add m4/locale-en.m4. --- ChangeLog | 8 ++++++++ m4/iswdigit.m4 | 18 +++++++++--------- modules/iswdigit | 1 + 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c19b7677b..a0e6412775 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-08-31 Bruno Haible + + iswdigit: Work around OpenBSD, Android, Haiku bug. + * m4/iswdigit.m4 (gl_FUNC_ISWDIGIT): 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/iswdigit (Files): Add m4/locale-en.m4. + 2024-08-31 Bruno Haible Prepare for stronger LC_CTYPE tests on OpenBSD, Android, Haiku. diff --git a/m4/iswdigit.m4 b/m4/iswdigit.m4 index d13c1ae967..ba7dbcbf6f 100644 --- a/m4/iswdigit.m4 +++ b/m4/iswdigit.m4 @@ -1,4 +1,4 @@ -# iswdigit.m4 serial 6 +# iswdigit.m4 serial 6.1 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_ISWDIGIT], AC_REQUIRE([gl_WCTYPE_H]) AC_REQUIRE([gt_LOCALE_FR]) 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_ISWDIGIT], 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_iswdigit_works="guessing no" ;; # Guess yes otherwise. *) gl_cv_func_iswdigit_works="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_FR != none || test $LOCALE_JA != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_ZH_CN != none; then + if test $LOCALE_FR != none || test $LOCALE_JA != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_ZH_CN != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include @@ -82,15 +82,15 @@ main (int argc, char *argv[]) if (!(is == 0)) result |= 2; } - 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, NetBSD 8.0, MSVC 14. */ + /* This fails on FreeBSD 13.0, NetBSD 10.0, OpenBSD 7.5, MSVC 14, Haiku, Android. */ /* U+0663 ARABIC-INDIC DIGIT THREE */ is = for_character ("\331\243", 2); if (!(is == 0)) result |= 4; - /* This fails on FreeBSD 13.0, NetBSD 8.0, MSVC 14. */ + /* This fails on FreeBSD 13.0, NetBSD 10.0, OpenBSD 7.5, MSVC 14, Haiku, Android. */ /* U+FF11 FULLWIDTH DIGIT ONE */ is = for_character ("\357\274\221", 3); if (!(is == 0)) diff --git a/modules/iswdigit b/modules/iswdigit index afa30b8de5..1a0091a01c 100644 --- a/modules/iswdigit +++ b/modules/iswdigit @@ -4,6 +4,7 @@ iswdigit() function: test wide character for being a digit. Files: lib/iswdigit.c m4/iswdigit.m4 +m4/locale-en.m4 m4/locale-fr.m4 m4/locale-ja.m4 m4/locale-zh.m4 -- 2.39.5