blob: 42ebe518d4533d136c892518d2234fe2739e9bc3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
From 756e1c8f23dc2720471298281c421c0076d02df8 Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Mon, 27 May 2024 23:23:11 +0300
Subject: [PATCH] Partial backport of r260554 (79fe19caf)
In particular, we need -DU_SHOW_CPLUSPLUS_API=0 to avoid compilation
errors in C++ parts of ICU headers which we are not using anyway.
Change-Id: Ib45c74e3caad148fbd778d0c07330127f7dab5ec
---
Source/WTF/wtf/Platform.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index a7b0f74bb7d17..af85a675266f8 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -1138,6 +1138,13 @@
#define ENABLE_PLATFORM_FONT_LOOKUP 1
#endif
+/* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */
+/* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
+#define U_SHOW_CPLUSPLUS_API 0
+#ifdef __cplusplus
+#define UCHAR_TYPE char16_t
+#endif
+
#if COMPILER(MSVC)
#undef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
|