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
|
diff --git a/expat/lib/expat_external.h b/expat/lib/expat_external.h
--- a/expat/lib/expat_external.h
+++ b/expat/lib/expat_external.h
@@ -137,6 +137,9 @@ extern "C" {
# endif
#endif
+/* BEGIN MOZILLA CHANGE (typedef XML_Char to char16_t) */
+#if 0
+
#ifdef XML_UNICODE /* Information is UTF-16 encoded. */
# ifdef XML_UNICODE_WCHAR_T
typedef wchar_t XML_Char;
@@ -150,6 +153,9 @@ typedef char XML_Char;
typedef char XML_LChar;
#endif /* XML_UNICODE */
+#endif
+/* END MOZILLA CHANGE */
+
#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
typedef long long XML_Index;
typedef unsigned long long XML_Size;
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -194,6 +194,9 @@ typedef char ICHAR;
#endif
+/* BEGIN MOZILLA CHANGE (typedef XML_Char to char16_t) */
+#if 0
+
#ifdef XML_UNICODE
# ifdef XML_UNICODE_WCHAR_T
@@ -211,6 +214,9 @@ typedef char ICHAR;
#endif
+#endif
+/* END MOZILLA CHANGE */
+
/* Round up n to be a multiple of sz, where sz is a power of 2. */
#define ROUND_UP(n, sz) (((n) + ((sz) - 1)) & ~((sz) - 1))
|
