propername-lite: Fix compilation error on Haiku r1/beta4 (regr. today).

* lib/propername-lite.c: Test HAVE_UCHAR_H instead of relying on
__has_include.
* modules/propername-lite (Depends-on): Add uchar-h.

diff --git a/ChangeLog b/ChangeLog
index 1b4963b2aab9014906bc5a7685abcb454f040afa..ad354680233f2a9f9277b5cdafd18487a651a363 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2025-09-05  Bruno Haible  <bruno@clisp.org>
+
+       propername-lite: Fix compilation error on Haiku r1/beta4 (regr. today).
+       * lib/propername-lite.c: Test HAVE_UCHAR_H instead of relying on
+       __has_include.
+       * modules/propername-lite (Depends-on): Add uchar-h.
+
 2025-09-05  Bruno Haible  <bruno@clisp.org>
 
        quotearg: Improve comment.

diff --git a/lib/propername-lite.c b/lib/propername-lite.c
index f11c9746d2c2512213639b47db6047112fc38dfa..4bcb860303d709e4227522df26fa4a2918c6ce60 100644 (file)
--- a/lib/propername-lite.c
+++ b/lib/propername-lite.c
@@ -21,17 +21,15 @@
 
 #include "gettext.h"
 
-#ifdef __has_include
-# if __has_include (<uchar.h>)
-#  include <uchar.h>
+#if HAVE_UCHAR_H
+# include <uchar.h>
 /* There is no need for the dependency hassle of replacing glibc mbrtoc32,
    as we don't care whether the C locale treats a byte with the high
    bit set as an encoding error.  */
-#  ifdef __GLIBC__
-#   undef mbrtoc32
-#  endif
-#  define USE_MBRTOC32
+# ifdef __GLIBC__
+#  undef mbrtoc32
 # endif
+# define USE_MBRTOC32
 #endif
 
 /* Return the localization of the name spelled NAME_ASCII in ASCII,

diff --git a/modules/propername-lite b/modules/propername-lite
index 2b002debb1ac3c2b89616000382838f4aed0ba20..20a0bfcb59307fd36bc2aa9e3e699052b7c0b121 100644 (file)
--- a/modules/propername-lite
+++ b/modules/propername-lite
@@ -7,6 +7,7 @@ lib/propername.h
 
 Depends-on:
 gettext-h
+uchar-h
 
 configure.ac:
 m4_ifdef([AM_XGETTEXT_OPTION],