blob: 18ae4aacb0696d0bebdc39f3368a42bf4871c37c (
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
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
From 934ff3e2768a4ef2f1b21ee883acb56cb8ae898b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 2 Dec 2020 22:34:54 +0100
Subject: [PATCH] Fix build with icu >= 68
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Source/WebCore/platform/text/TextCodecICU.cpp | 15 +++++++++++++++
Source/WebCore/platform/text/icu/UTextProvider.h | 15 +++++++++++++++
.../platform/text/icu/UTextProviderLatin1.cpp | 15 +++++++++++++++
.../platform/text/icu/UTextProviderUTF16.cpp | 15 +++++++++++++++
4 files changed, 60 insertions(+)
diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp
index dd6ff0675..7ce8a70ef 100644
--- a/Source/WebCore/platform/text/TextCodecICU.cpp
+++ b/Source/WebCore/platform/text/TextCodecICU.cpp
@@ -39,6 +39,21 @@
#include <wtf/text/StringBuilder.h>
#include <wtf/unicode/CharacterNames.h>
+// Since icu 68.1 icu we have to:
+#ifndef TRUE
+// Taken from umachibe.h:
+/**
+ * The TRUE value of a UBool.
+ *
+ * @deprecated ICU 68 Use standard "true" instead.
+ */
+# define TRUE true
+#endif
+
+#ifndef FALSE
+# define FALSE false
+#endif
+
namespace WebCore {
const size_t ConversionBufferSize = 16384;
diff --git a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h
index c254fc4c7..9d2ad8b8c 100644
--- a/Source/WebCore/platform/text/icu/UTextProvider.h
+++ b/Source/WebCore/platform/text/icu/UTextProvider.h
@@ -28,6 +28,21 @@
#include <unicode/utext.h>
+// Since icu 68.1 icu we have to:
+#ifndef TRUE
+// Taken from umachibe.h:
+/**
+ * The TRUE value of a UBool.
+ *
+ * @deprecated ICU 68 Use standard "true" instead.
+ */
+# define TRUE true
+#endif
+
+#ifndef FALSE
+# define FALSE false
+#endif
+
namespace WebCore {
enum class UTextProviderContext {
diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
index cd6852c71..0c95ea529 100644
--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
@@ -29,6 +29,21 @@
#include "UTextProvider.h"
#include <wtf/text/StringImpl.h>
+// Since icu 68.1 icu we have to:
+#ifndef TRUE
+// Taken from umachibe.h:
+/**
+ * The TRUE value of a UBool.
+ *
+ * @deprecated ICU 68 Use standard "true" instead.
+ */
+# define TRUE true
+#endif
+
+#ifndef FALSE
+# define FALSE false
+#endif
+
namespace WebCore {
// Latin1 provider
diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
index 7aaac48c8..6ac693602 100644
--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
@@ -28,6 +28,21 @@
#include "UTextProvider.h"
+// Since icu 68.1 icu we have to:
+#ifndef TRUE
+// Taken from umachibe.h:
+/**
+ * The TRUE value of a UBool.
+ *
+ * @deprecated ICU 68 Use standard "true" instead.
+ */
+# define TRUE true
+#endif
+
+#ifndef FALSE
+# define FALSE false
+#endif
+
namespace WebCore {
// UTF16ContextAware provider
|
