From 37aca11f5c9388a56bb9f2640f182ef856439d5b Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 11 Mar 2003 12:21:40 +0000 Subject: [PATCH] - fix needed by g++ 3.x Changed files: expat-gcc3-c++.patch -> 1.1 --- expat-gcc3-c++.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 expat-gcc3-c++.patch diff --git a/expat-gcc3-c++.patch b/expat-gcc3-c++.patch new file mode 100644 index 0000000..ac7b886 --- /dev/null +++ b/expat-gcc3-c++.patch @@ -0,0 +1,62 @@ +--- expat-1.95.6/lib/expat.h.orig Thu Jan 16 22:03:42 2003 ++++ expat-1.95.6/lib/expat.h Tue Mar 11 12:16:14 2003 +@@ -488,6 +488,30 @@ + void (*release)(void *data); + } XML_Encoding; + ++/* The XML_Status enum gives the possible return values for the ++ XML_Parse and XML_ParseBuffer functions. Though the return values ++ for these functions has always been described as a Boolean value, ++ the implementation, at least for the 1.95.x series, has always ++ returned exactly one of these values. The preprocessor #defines ++ are included so this stanza can be added to code that still needs ++ to support older versions of Expat 1.95.x: ++ ++ #ifndef XML_STATUS_OK ++ #define XML_STATUS_OK 1 ++ #define XML_STATUS_ERROR 0 ++ #endif ++ ++ Otherwise, the #define hackery is quite ugly and would have been dropped. ++*/ ++ ++enum XML_Status { ++ XML_STATUS_ERROR = 0, ++#define XML_STATUS_ERROR XML_STATUS_ERROR ++ XML_STATUS_OK = 1 ++#define XML_STATUS_OK XML_STATUS_OK ++}; ++ ++ + /* This is called for an encoding that is unknown to the parser. + + The encodingHandlerData argument is that which was passed as the +@@ -716,28 +740,7 @@ + /* Parses some input. Returns XML_STATUS_ERROR if a fatal error is + detected. The last call to XML_Parse must have isFinal true; len + may be zero for this call (or any other). +- +- The XML_Status enum gives the possible return values for the +- XML_Parse and XML_ParseBuffer functions. Though the return values +- for these functions has always been described as a Boolean value, +- the implementation, at least for the 1.95.x series, has always +- returned exactly one of these values. The preprocessor #defines +- are included so this stanza can be added to code that still needs +- to support older versions of Expat 1.95.x: +- +- #ifndef XML_STATUS_OK +- #define XML_STATUS_OK 1 +- #define XML_STATUS_ERROR 0 +- #endif +- +- Otherwise, the #define hackery is quite ugly and would have been dropped. + */ +-enum XML_Status { +- XML_STATUS_ERROR = 0, +-#define XML_STATUS_ERROR XML_STATUS_ERROR +- XML_STATUS_OK = 1 +-#define XML_STATUS_OK XML_STATUS_OK +-}; + + XMLPARSEAPI(enum XML_Status) + XML_Parse(XML_Parser parser, const char *s, int len, int isFinal); -- 2.43.0