diff options
| author | Thies C. Arntzen <thies@php.net> | 2001-07-30 15:10:53 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 2001-07-30 15:10:53 +0000 |
| commit | 33e059062b868bf35c30d34fa2b518c4bc0d7773 (patch) | |
| tree | c216b97598c21d3aa9226ba6d91c8722c6d496e8 /ext/xml/expat/xmlparse.c | |
| parent | 6627bab38df36f50930afed4da5726266481ee75 (diff) | |
| download | php-git-33e059062b868bf35c30d34fa2b518c4bc0d7773.tar.gz | |
@- Bump bundled expat to 1.95.2 (Thies)
Diffstat (limited to 'ext/xml/expat/xmlparse.c')
| -rw-r--r-- | ext/xml/expat/xmlparse.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/ext/xml/expat/xmlparse.c b/ext/xml/expat/xmlparse.c index d11079b7bd..9836e9149a 100644 --- a/ext/xml/expat/xmlparse.c +++ b/ext/xml/expat/xmlparse.c @@ -3,23 +3,18 @@ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd See the file COPYING for copying permission. */ -#if 0 -static char RCSId[] - = "$Header$"; -#endif - #include "php_compat.h" #ifdef COMPILED_FROM_DSP # include "winconfig.h" -# define XMLPARSEAPI __declspec(dllexport) +# define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl # include "expat.h" # undef XMLPARSEAPI #else #include <php_config.h> #ifdef __declspec -# define XMLPARSEAPI __declspec(dllexport) +# define XMLPARSEAPI(type) __declspec(dllexport) type __cdecl #endif #include "expat.h" @@ -30,6 +25,7 @@ static char RCSId[] #endif /* ndef COMPILED_FROM_DSP */ #include <stddef.h> +#include <string.h> #ifdef XML_UNICODE #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX @@ -457,6 +453,7 @@ typedef struct { #define notStandaloneHandler (((Parser *)parser)->m_notStandaloneHandler) #define externalEntityRefHandler (((Parser *)parser)->m_externalEntityRefHandler) #define externalEntityRefHandlerArg (((Parser *)parser)->m_externalEntityRefHandlerArg) +#define internalEntityRefHandler (((Parser *)parser)->m_internalEntityRefHandler) #define unknownEncodingHandler (((Parser *)parser)->m_unknownEncodingHandler) #define elementDeclHandler (((Parser *)parser)->m_elementDeclHandler) #define attlistDeclHandler (((Parser *)parser)->m_attlistDeclHandler) @@ -1328,8 +1325,19 @@ const XML_LChar *XML_ErrorString(int code) } const XML_LChar * -XML_ExpatVersion() { - return "1.95.1"; /*VERSION; thies@thieso.net*/ +XML_ExpatVersion(void) { + return "1.95.2"; +} + +XML_Expat_Version +XML_ExpatVersionInfo(void) { + XML_Expat_Version version; + + version.major = XML_MAJOR_VERSION; + version.minor = XML_MINOR_VERSION; + version.micro = XML_MICRO_VERSION; + + return version; } static @@ -2746,7 +2754,7 @@ doProlog(XML_Parser parser, return XML_ERROR_NO_MEMORY; if (attlistDeclHandler && declAttributeType) { if (*declAttributeType == '(' - || *declAttributeType == 'N' && declAttributeType[1] == 'O') { + || (*declAttributeType == 'N' && declAttributeType[1] == 'O')) { /* Enumerated or Notation type */ if (! poolAppendChar(&tempPool, ')') || ! poolAppendChar(&tempPool, '\0')) @@ -2780,7 +2788,7 @@ doProlog(XML_Parser parser, return XML_ERROR_NO_MEMORY; if (attlistDeclHandler && declAttributeType) { if (*declAttributeType == '(' - || *declAttributeType == 'N' && declAttributeType[1] == 'O') { + || (*declAttributeType == 'N' && declAttributeType[1] == 'O')) { /* Enumerated or Notation type */ if (! poolAppendChar(&tempPool, ')') || ! poolAppendChar(&tempPool, '\0')) |