From 19c0df3b7c7249f5601af77e7a9f68d19d9981e0 Mon Sep 17 00:00:00 2001 From: "nisheeth%netscape.com" Date: Mon, 19 Apr 1999 22:43:14 +0000 Subject: [PATCH] Patch to get expat to compile on SGI. Many thanks to Tim Rowley (tor@cs.brown.edu) for doing all the work on this. I am simply checking it in for him. git-svn-id: svn://10.0.0.236/trunk@28144 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/expat/xmlparse/xmlparse.c | 4 ++-- mozilla/parser/expat/lib/xmlparse.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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)