From 8201dc13b53069f7a5228f833f53f8440566643d Mon Sep 17 00:00:00 2001
From: Takuji Tanaka <ttk@t-lab.opal.ne.jp>
Date: Wed, 5 Jul 2023 12:10:51 +0000
Subject: [PATCH] upmendex: enable to build with icu.dll for Windows 10

git-svn-id: svn://tug.org/texlive/trunk/Build/source@67554 c570f23f-e606-0410-a88d-b1316a301751
---
 texk/upmendex/ChangeLog | 7 +++++++
 texk/upmendex/fwrite.c  | 1 -
 texk/upmendex/mendex.h  | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/texk/upmendex/ChangeLog b/texk/upmendex/ChangeLog
index e5f4c1df36..f30cb06284 100644
--- a/texk/upmendex/ChangeLog
+++ b/texk/upmendex/ChangeLog
@@ -1,3 +1,10 @@
+2023-07-05  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* fwrite.c, mendex.h:
+	Enable to build with system ICU DLL icu.dll
+	for Windows 10 version 1903 (May 2019 Update) or later.
+	https://learn.microsoft.com/en-us/windows/win32/intl/international-components-for-unicode--icu-
+
 2023-03-09  Karl Berry  <karl@tug.org>
 
 	* TL'23 release.
diff --git a/texk/upmendex/fwrite.c b/texk/upmendex/fwrite.c
index f33230df8e..a0077199ab 100644
--- a/texk/upmendex/fwrite.c
+++ b/texk/upmendex/fwrite.c
@@ -3,7 +3,6 @@
 #include <stdarg.h>
 
 #include <kpathsea/tex-file.h>
-#include <unicode/unorm2.h>
 
 #include "exkana.h"
 #include "exhanzi.h"
diff --git a/texk/upmendex/mendex.h b/texk/upmendex/mendex.h
index d4bad85e8c..f9cbc88fa5 100644
--- a/texk/upmendex/mendex.h
+++ b/texk/upmendex/mendex.h
@@ -6,10 +6,15 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if defined(WIN32) && defined(WITH_SYSTEM_ICU)
+#include <icu.h>
+#else
 #include <unicode/utypes.h>
 #include <unicode/ustring.h>
 #include <unicode/uchar.h>
 #include <unicode/ucol.h>
+#include <unicode/unorm2.h>
+#endif
 
 #define PAGE_COMPOSIT_DEPTH 10