Prefix some symbols with php_

^(pcre|Xml|XML).*

diff --git a/ext/pcre/pcrelib/pcre.h b/ext/pcre/pcrelib/pcre.h
index 4888b452570ff59176bc390c40ce3f106cc0f2a5..b7012bcbe0c23335f49c2196d8727092384c2fb4 100644 (file)
--- a/ext/pcre/pcrelib/pcre.h
+++ b/ext/pcre/pcrelib/pcre.h
@@ -11,6 +11,8 @@
 #define PCRE_MINOR 08
 #define PCRE_DATE  31-Aug-1999
 
+#include "php_compat.h"
+
 /* Win32 uses DLL by default */
 
 #ifdef _WIN32

diff --git a/ext/xml/expat/xmlparse/hashtable.c b/ext/xml/expat/xmlparse/hashtable.c
index 780a0610414d29f834f0b86fc7ed6b7c5a76f52b..9f9921fb0a5c8940723c5b3a7a67c73079393733 100644 (file)
--- a/ext/xml/expat/xmlparse/hashtable.c
+++ b/ext/xml/expat/xmlparse/hashtable.c
@@ -28,6 +28,8 @@ GPL. If you do not delete the provisions above, a recipient may use
 your version of this file under either the MPL or the GPL.
 */
 
+#include "php_compat.h"
+
 #include "xmldef.h"
 
 #ifdef XML_UNICODE_WCHAR_T

diff --git a/ext/xml/expat/xmlparse/xmlparse.c b/ext/xml/expat/xmlparse/xmlparse.c
index aba28061d2d1e8ee8882fa19a8c43c4b8d7925cc..3354bcbc96fce4f1700a455322d2b0ca21f0e619 100644 (file)
--- a/ext/xml/expat/xmlparse/xmlparse.c
+++ b/ext/xml/expat/xmlparse/xmlparse.c
@@ -28,6 +28,8 @@ GPL. If you do not delete the provisions above, a recipient may use
 your version of this file under either the MPL or the GPL.
 */
 
+#include "php_compat.h"
+
 #include "xmldef.h"
 #include "xmlparse.h"
 

diff --git a/ext/xml/expat/xmltok/xmlrole.c b/ext/xml/expat/xmltok/xmlrole.c
index b18e35eb3c42a7d0bfe91e066bbff9e349bff2df..1a49e5342a9073b8d492703d971f566f5fdde604 100644 (file)
--- a/ext/xml/expat/xmltok/xmlrole.c
+++ b/ext/xml/expat/xmltok/xmlrole.c
@@ -28,6 +28,8 @@ GPL. If you do not delete the provisions above, a recipient may use
 your version of this file under either the MPL or the GPL.
 */
 
+#include "php_compat.h"
+
 #include "xmldef.h"
 #include "xmlrole.h"
 

diff --git a/ext/xml/expat/xmltok/xmltok.c b/ext/xml/expat/xmltok/xmltok.c
index d106b1b3a904d3b1d61d1f348101259362c69aa4..487659e94bf9b8d78cb5d54440a299afaf95c723 100644 (file)
--- a/ext/xml/expat/xmltok/xmltok.c
+++ b/ext/xml/expat/xmltok/xmltok.c
@@ -28,6 +28,8 @@ GPL. If you do not delete the provisions above, a recipient may use
 your version of this file under either the MPL or the GPL.
 */
 
+#include "php_compat.h"
+
 #include "xmldef.h"
 #include "xmltok.h"
 #include "nametab.h"

diff --git a/main/php.h b/main/php.h
index e7aa8ce81ddc7b3521300f245ce1f2eca4f91049..2f8eb29a9d9403f7c2502ae017e2382992cb62a6 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -32,6 +32,7 @@
 
 #include "php_version.h"
 #include "zend.h"
+#include "php_compat.h"
 
 /* automake defines PACKAGE and VERSION for Zend too */
 #ifdef PACKAGE

diff --git a/main/php_compat.h b/main/php_compat.h
new file mode 100644 (file)
index 0000000..90b78c1
--- /dev/null
+++ b/main/php_compat.h
@@ -0,0 +1,65 @@
+#ifndef PHP_COMPAT_H
+#define PHP_COMPAT_H
+
+#if defined(HAVE_BUNDLED_PCRE) || !defined(PHP_VERSION)
+#define pcre_compile                   php_pcre_compile
+#define pcre_copy_substring            php_pcre_copy_substring
+#define pcre_exec                              php_pcre_exec
+#define pcre_get_substring             php_pcre_substring
+#define pcre_get_substring_list        php_pcre_get_substring_list
+#define pcre_info                              php_pcre_info
+#define pcre_maketables                        php_pcre_maketables
+#define pcre_study                             php_pcre_study
+#define pcre_version                   php_pcre_version
+#endif
+
+#define lookup                         php_lookup
+#define hashTableInit          php_hashTableInit
+#define hashTableDestroy       php_hashTableDestroy
+#define hashTableIterInit      php_hashTableIterInit
+#define hashTableIterNext      php_hashTableIterNext
+#define XML_DefaultCurrent php_XML_DefaultCurrent
+#define XML_ErrorString php_XML_ErrorString
+#define XML_ExternalEntityParserCreate php_XML_ExternalEntityParserCreate
+#define XML_GetBase php_XML_GetBase
+#define XML_GetBuffer php_XML_GetBuffer
+#define XML_GetCurrentByteCount php_XML_GetCurrentByteCount
+#define XML_GetCurrentByteIndex php_XML_GetCurrentByteIndex
+#define XML_GetCurrentColumnNumber php_XML_GetCurrentColumnNumber
+#define XML_GetCurrentLineNumber php_XML_GetCurrentLineNumber
+#define XML_GetErrorCode php_XML_GetErrorCode
+#define XML_GetSpecifiedAttributeCount php_XML_GetSpecifiedAttributeCount
+#define XML_Parse php_XML_Parse
+#define XML_ParseBuffer php_XML_ParseBuffer
+#define XML_ParserCreate php_XML_ParserCreate
+#define XML_ParserCreateNS php_XML_ParserCreateNS
+#define XML_ParserFree php_XML_ParserFree
+#define XML_SetBase php_XML_SetBase
+#define XML_SetCdataSectionHandler php_XML_SetCdataSectionHandler
+#define XML_SetCharacterDataHandler php_XML_SetCharacterDataHandler
+#define XML_SetCommentHandler php_XML_SetCommentHandler
+#define XML_SetDefaultHandler php_XML_SetDefaultHandler
+#define XML_SetDefaultHandlerExpand php_XML_SetDefaultHandlerExpand
+#define XML_SetElementHandler php_XML_SetElementHandler
+#define XML_SetEncoding php_XML_SetEncoding
+#define XML_SetExternalEntityRefHandler php_XML_SetExternalEntityRefHandler
+#define XML_SetExternalEntityRefHandlerArg php_XML_SetExternalEntityRefHandlerArg
+#define XML_SetNamespaceDeclHandler php_XML_SetNamespaceDeclHandler
+#define XML_SetNotStandaloneHandler php_XML_SetNotStandaloneHandler
+#define XML_SetNotationDeclHandler php_XML_SetNotationDeclHandler
+#define XML_SetProcessingInstructionHandler php_XML_SetProcessingInstructionHandler
+#define XML_SetUnknownEncodingHandler php_XML_SetUnknownEncodingHandler
+#define XML_SetUnparsedEntityDeclHandler php_XML_SetUnparsedEntityDeclHandler
+#define XML_SetUserData php_XML_SetUserData
+#define XML_UseParserAsHandlerArg php_XML_UseParserAsHandlerArg
+#define XmlGetUtf16InternalEncoding php_XmlGetUtf16InternalEncoding
+#define XmlGetUtf8InternalEncoding php_XmlGetUtf8InternalEncoding
+#define XmlInitEncoding php_XmlInitEncoding
+#define XmlInitUnknownEncoding php_XmlInitUnknownEncoding
+#define XmlParseXmlDecl php_XmlParseXmlDecl
+#define XmlSizeOfUnknownEncoding php_XmlSizeOfUnknownEncoding
+#define XmlUtf16Encode php_XmlUtf16Encode
+#define XmlUtf8Encode php_XmlUtf8Encode
+#define XmlPrologStateInit php_XmlPrologStateInit
+
+#endif