From 385d12e54b75d91260ca9b54fd5e7f5c871bb357 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Sun, 3 Sep 2017 00:07:50 +0200
Subject: [PATCH] xmlparse.c: Resolve macro "initEncoding" (issue #59)

---
 expat/lib/xmlparse.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 4b86b2b0..23509439 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -663,7 +663,6 @@ struct XML_ParserStruct {
 #define internalEntityRefHandler \
         (parser->m_internalEntityRefHandler)
 #define encoding (parser->m_encoding)
-#define initEncoding (parser->m_initEncoding)
 #define internalEncoding (parser->m_internalEncoding)
 #define unknownEncodingMem (parser->m_unknownEncodingMem)
 #define unknownEncodingData (parser->m_unknownEncodingData)
@@ -1116,7 +1115,7 @@ parserInit(XML_Parser parser, const XML_Char *encodingName)
     protocolEncodingName = copyString(encodingName, &(parser->m_mem));
   }
   curBase = NULL;
-  XmlInitEncoding(&initEncoding, &encoding, 0);
+  XmlInitEncoding(&parser->m_initEncoding, &encoding, 0);
   parser->m_userData = NULL;
   parser->m_handlerArg = NULL;
   parser->m_startElementHandler = NULL;
@@ -3959,7 +3958,7 @@ initializeEncoding(XML_Parser parser)
 #else
   s = protocolEncodingName;
 #endif
-  if ((ns ? XmlInitEncodingNS : XmlInitEncoding)(&initEncoding, &encoding, s))
+  if ((ns ? XmlInitEncodingNS : XmlInitEncoding)(&parser->m_initEncoding, &encoding, s))
     return XML_ERROR_NONE;
   return handleUnknownEncoding(parser, protocolEncodingName);
 }
-- 
2.40.0