From: Bruno Haible <bruno@clisp.org>
Date: Fri, 5 Sep 2025 09:33:44 +0000 (+0200)
Subject: propername-lite: Fix compilation error on Haiku r1/beta4 (regr. today).
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11765a0ae9cb576118bd767d3ec51fba43c56466;p=thirdparty%2Fgnulib.git

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 1b4963b2aa..ad35468023 100644
--- 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 f11c9746d2..4bcb860303 100644
--- 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 2b002debb1..20a0bfcb59 100644
--- 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],