diff --git a/mozilla/expat/xmltok/xmldef.h b/mozilla/expat/xmltok/xmldef.h
index dfc4139ebff..f9edff8a4cb 100644
--- a/mozilla/expat/xmltok/xmldef.h
+++ b/mozilla/expat/xmltok/xmldef.h
@@ -60,7 +60,11 @@ particular environments. */
 #define realloc(x, y) PR_Realloc((x), (y))
 #define calloc(x, y) PR_Calloc((x),(y))
 #define free(x) PR_Free(x)
-#define int int32
+
+#if PR_BYTES_PER_INT != 4
+typedef PRInt32 int;
+#endif
+
 
 /* Enable Unicode string processing in expat */
 #define XML_UNICODE
diff --git a/mozilla/parser/expat/lib/xmldef.h b/mozilla/parser/expat/lib/xmldef.h
index dfc4139ebff..f9edff8a4cb 100644
--- a/mozilla/parser/expat/lib/xmldef.h
+++ b/mozilla/parser/expat/lib/xmldef.h
@@ -60,7 +60,11 @@ particular environments. */
 #define realloc(x, y) PR_Realloc((x), (y))
 #define calloc(x, y) PR_Calloc((x),(y))
 #define free(x) PR_Free(x)
-#define int int32
+
+#if PR_BYTES_PER_INT != 4
+typedef PRInt32 int;
+#endif
+
 
 /* Enable Unicode string processing in expat */
 #define XML_UNICODE