diff --git a/mozilla/expat/xmlparse/xmlparse.c b/mozilla/expat/xmlparse/xmlparse.c
index 381f8264912..b6ff6117df8 100644
--- a/mozilla/expat/xmlparse/xmlparse.c
+++ b/mozilla/expat/xmlparse/xmlparse.c
@@ -280,7 +280,7 @@ typedef struct {
   XML_ExternalEntityRefHandler externalEntityRefHandler;
   void *externalEntityRefHandlerArg;
   XML_UnknownEncodingHandler unknownEncodingHandler;
-  const ENCODING *encoding;
+  const ENCODING *parserEncoding;
   INIT_ENCODING initEncoding;
   const XML_Char *protocolEncodingName;
   int ns;
@@ -336,7 +336,7 @@ typedef struct {
 #define externalEntityRefHandler (((Parser *)parser)->externalEntityRefHandler)
 #define externalEntityRefHandlerArg (((Parser *)parser)->externalEntityRefHandlerArg)
 #define unknownEncodingHandler (((Parser *)parser)->unknownEncodingHandler)
-#define encoding (((Parser *)parser)->encoding)
+#define encoding (((Parser *)parser)->parserEncoding)
 #define initEncoding (((Parser *)parser)->initEncoding)
 #define unknownEncodingMem (((Parser *)parser)->unknownEncodingMem)
 #define unknownEncodingData (((Parser *)parser)->unknownEncodingData)
diff --git a/mozilla/parser/expat/lib/xmlparse.c b/mozilla/parser/expat/lib/xmlparse.c
index 381f8264912..b6ff6117df8 100644
--- a/mozilla/parser/expat/lib/xmlparse.c
+++ b/mozilla/parser/expat/lib/xmlparse.c
@@ -280,7 +280,7 @@ typedef struct {
   XML_ExternalEntityRefHandler externalEntityRefHandler;
   void *externalEntityRefHandlerArg;
   XML_UnknownEncodingHandler unknownEncodingHandler;
-  const ENCODING *encoding;
+  const ENCODING *parserEncoding;
   INIT_ENCODING initEncoding;
   const XML_Char *protocolEncodingName;
   int ns;
@@ -336,7 +336,7 @@ typedef struct {
 #define externalEntityRefHandler (((Parser *)parser)->externalEntityRefHandler)
 #define externalEntityRefHandlerArg (((Parser *)parser)->externalEntityRefHandlerArg)
 #define unknownEncodingHandler (((Parser *)parser)->unknownEncodingHandler)
-#define encoding (((Parser *)parser)->encoding)
+#define encoding (((Parser *)parser)->parserEncoding)
 #define initEncoding (((Parser *)parser)->initEncoding)
 #define unknownEncodingMem (((Parser *)parser)->unknownEncodingMem)
 #define unknownEncodingData (((Parser *)parser)->unknownEncodingData)