mirror of
https://github.com/roytam1/UXP.git
synced 2026-05-26 13:58:49 +00:00
Job Bautista
a730f838c8
- Skipped the fix for BZ 569229 because I don't know where to apply that; the processInternalEntity method no longer exists. Hopefully the bug doesn't re- appear. - Previous fixes for 3rd and 13th patches have been merged to their respective patches as well. - 15th patch is now a fix for the 13th and 14th since somewhere between 2.6.4 and 2.7.3 has made use of a debugging method we don't want to use as well as a new boolean method called parserBusy which got mistakenly excluded as an unused API while rewriting the 14th patch.
40 lines
1004 B
Diff
40 lines
1004 B
Diff
diff --git a/lib/expat_external.h b/lib/expat_external.h
|
|
--- a/lib/expat_external.h
|
|
+++ b/lib/expat_external.h
|
|
@@ -138,6 +138,7 @@
|
|
# endif
|
|
# endif
|
|
|
|
+#ifndef MOZILLA_CLIENT /* typedef XML_Char to char16_t */
|
|
# ifdef XML_UNICODE /* Information is UTF-16 encoded. */
|
|
# ifdef XML_UNICODE_WCHAR_T
|
|
typedef wchar_t XML_Char;
|
|
@@ -150,6 +151,7 @@
|
|
typedef char XML_Char;
|
|
typedef char XML_LChar;
|
|
# endif /* XML_UNICODE */
|
|
+#endif /* MOZILLA_CLIENT */
|
|
|
|
# ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
|
|
typedef long long XML_Index;
|
|
diff --git a/lib/xmlparse.c b/lib/xmlparse.c
|
|
--- a/lib/xmlparse.c
|
|
+++ b/lib/xmlparse.c
|
|
@@ -195,6 +195,7 @@
|
|
|
|
#endif
|
|
|
|
+#ifndef MOZILLA_CLIENT /* typedef XML_Char to char16_t */
|
|
#ifdef XML_UNICODE
|
|
|
|
# ifdef XML_UNICODE_WCHAR_T
|
|
@@ -211,6 +212,7 @@
|
|
# define XML_L(x) x
|
|
|
|
#endif
|
|
+#endif /* MOZILLA_CLIENT */
|
|
|
|
/* 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))
|
|
|