mirror of
https://github.com/roytam1/basilisk55.git
synced 2026-05-27 08:31:16 +00:00
roytam1
ee15f2005b
- Issue #2889 - Part 0: Relocate Mozilla-specific files from Expat source. (b81b97ee) - Issue #2889 - Part 1: Prepare Mozilla's changes and extensions for Expat 2.6.4. (95676016) - Issue #2889 - Part 2: Import Expat 2.6.4 source. (9ade98b4) - Issue #2889 - Part 3: Apply Mozilla's patches to Expat 2.6.4. (0b9e221b) - Issue #2889 - Part 4: Fix build and runtime issues. (a2f8e661) - Issue #2889 - Follow-up: Avoid conflicts with system version of libexpat (e0f8acdd) - Issue #2889 - Follow-up: void methods shouldn't return a value. (8956c611) - Issue #2889 - Part 5: Rewrite patches for Expat 2.7.3. (a730f838) - Issue #2889 - Part 6: Import Expat 2.7.3 source. (d2acec73) - Issue #2889 - Part 7: Apply patches to Expat 2.7.3. (ca2ef518) - Issue #2889 - Follow-up: Allow generate_hash_secret_salt to be used. (acefed74) - Issue #2889 - Follow-up: Adjust Expat 2.7.3 local patches for removal of 3rd patch. (034eeaff) - Issue #2889 - Follow-up: Remove fix for BZ 569229. (493169e2)
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))
|
|
|