netbsd: revert _ISOC99_SOURCE, add uchar.h condition; from Marc

git-svn-id: svn://tug.org/texlive/trunk/Build/source@72716 c570f23f-e606-0410-a88d-b1316a301751
TeX-Live · Oct 31, 2024 · 084f93b · 084f93b
1 parent eb771e7
commit 084f93b
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 19 deletions.
diff --git a/libs/icu/ChangeLog b/libs/icu/ChangeLog
@@ -1,3 +1,16 @@
+2024-10-30  Karl Berry  <[email protected]>
+
+	* icu-src/source/common/uposixdefs.h: undo #define of
+	 _ISOC99_SOURCE on __NETBSD__, what was patch-19-netbsd,
+	 now delete. (See TLpatches/ChangeLog).
+	 * icu-src/source/common/unicode/ptypes.h [U_PLATFORM_IS_LINUX_BASED]:
+	 add conditional for #include <uchar.h>.
+
+2024-10-27  Karl Berry  <[email protected]>
+
+	* Import 76.2.
+	(version.ac): update.
+
 2023-12-22  Karl Berry  <[email protected]>
 
 	* Import 74.2.

diff --git a/libs/icu/TLpatches/ChangeLog b/libs/icu/TLpatches/ChangeLog
@@ -1,3 +1,10 @@
+2024-10-30  Karl Berry  <[email protected]>
+
+	* 
+	* patch-19-netbsd: remove
+	Per Marc Baudoin,
+	https://tug.org/pipermail/tlbuild/2024q4/005581.html
+
 2024-10-27  Karl Berry  <[email protected]>
 
 	Update for icu-76.1.

diff --git a/libs/icu/TLpatches/patch-18-uchar b/libs/icu/TLpatches/patch-18-uchar
@@ -0,0 +1,12 @@
+	From Marc Baudoin.
+	https://tug.org/pipermail/tlbuild/2024q4/005581.html
+
+--- source/common/unicode/ptypes.h~	2024-10-24 11:24:00.000000000 -0700
++++ source/common/unicode/ptypes.h	2024-10-30 17:25:22.442817993 -0700
+@@ -57,5 +57,5 @@
+ // ICU4C must detect and deal with that.
+ #if !defined(__cplusplus) && !defined(U_IN_DOXYGEN)
+-#   if U_HAVE_CHAR16_T
++#   if U_HAVE_CHAR16_T && U_PLATFORM_IS_LINUX_BASED
+ #       include <uchar.h>
+ #   else
diff --git a/libs/icu/TLpatches/patch-19-netbsd b/libs/icu/TLpatches/patch-19-netbsd
diff --git a/libs/icu/icu-src/source/common/unicode/ptypes.h b/libs/icu/icu-src/source/common/unicode/ptypes.h
@@ -56,7 +56,7 @@
 // implementations (looking at you, Apple, spring 2024) actually do this, so
 // ICU4C must detect and deal with that.
 #if !defined(__cplusplus) && !defined(U_IN_DOXYGEN)
-#   if U_HAVE_CHAR16_T
+#   if U_HAVE_CHAR16_T && U_PLATFORM_IS_LINUX_BASED
 #       include <uchar.h>
 #   else
         typedef uint16_t char16_t;

diff --git a/libs/icu/icu-src/source/common/uposixdefs.h b/libs/icu/icu-src/source/common/uposixdefs.h
@@ -74,8 +74,4 @@
 #define _POSIX_C_SOURCE 200809L
 #endif
 
-#if defined(__cplusplus) && defined(__NetBSD__)
-#define _ISOC99_SOURCE
-#endif
-
 #endif  /* __UPOSIXDEFS_H__ */