Sync Mozilla defines.

diff --git a/expat/xmltok/xmldef.h b/expat/xmltok/xmldef.h
index e63e1a525b52f23513b127b6eb2ef7a6f39dec88..57b83339b392710ae99289682f9daf72c1e9d7d3 100755 (executable)
--- a/expat/xmltok/xmldef.h
+++ b/expat/xmltok/xmldef.h
@@ -26,13 +26,27 @@ See the file copying.txt for copying permission.
 /* This file can be used for any definitions needed in
 particular environments. */
 
-#ifdef MOZILLA
+/* Mozilla specific defines */
+
+#ifdef MOZILLA_CLIENT
 
 #include "nspr.h"
-#define malloc(x) PR_Malloc(x)
-#define realloc(x, y) PR_Realloc((x), (y))
+#define malloc(x) PR_Malloc((size_t)(x))
+#define realloc(x, y) PR_Realloc((x), (size_t)(y))
 #define calloc(x, y) PR_Calloc((x),(y))
 #define free(x) PR_Free(x)
+#if PR_BYTES_PER_INT != 4
 #define int int32
+#endif
+
+/* Enable Unicode string processing in expat. */
+#ifndef XML_UNICODE
+#define XML_UNICODE
+#endif
+
+/* Enable external parameter entity parsing in expat */
+#ifndef XML_DTD
+#define XML_DTD 1
+#endif
 
-#endif /* MOZILLA */
+#endif /* MOZILLA_CLIENT */