00_xmlchar.patch (1148B)
1 diff --git a/expat/lib/expat_external.h b/expat/lib/expat_external.h 2 --- a/expat/lib/expat_external.h 3 +++ b/expat/lib/expat_external.h 4 @@ -137,6 +137,9 @@ extern "C" { 5 # endif 6 #endif 7 8 +/* BEGIN MOZILLA CHANGE (typedef XML_Char to char16_t) */ 9 +#if 0 10 + 11 #ifdef XML_UNICODE /* Information is UTF-16 encoded. */ 12 # ifdef XML_UNICODE_WCHAR_T 13 typedef wchar_t XML_Char; 14 @@ -150,6 +153,9 @@ typedef char XML_Char; 15 typedef char XML_LChar; 16 #endif /* XML_UNICODE */ 17 18 +#endif 19 +/* END MOZILLA CHANGE */ 20 + 21 #ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */ 22 typedef long long XML_Index; 23 typedef unsigned long long XML_Size; 24 diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c 25 --- a/expat/lib/xmlparse.c 26 +++ b/expat/lib/xmlparse.c 27 @@ -194,6 +194,9 @@ typedef char ICHAR; 28 29 #endif 30 31 +/* BEGIN MOZILLA CHANGE (typedef XML_Char to char16_t) */ 32 +#if 0 33 + 34 #ifdef XML_UNICODE 35 36 # ifdef XML_UNICODE_WCHAR_T 37 @@ -211,6 +214,9 @@ typedef char ICHAR; 38 39 #endif 40 41 +#endif 42 +/* END MOZILLA CHANGE */ 43 + 44 /* Round up n to be a multiple of sz, where sz is a power of 2. */ 45 #define ROUND_UP(n, sz) (((n) + ((sz) - 1)) & ~((sz) - 1))