cvs: /php4 php_compat.h php.h /php4/ext/pcre/pcrelib pcre.h /php4/ext/xml/expat/xmlparse hashtable.c xmlparse.c /php4/ext/xml/expat/xmltok xmlrole.c
xmltok.c
| From: | Sascha Schumann | Date: | Sat, 04 Mar 2000 14:44:01 +0000 |
| Subject: | cvs: /php4 php_compat.h php.h /php4/ext/pcre/pcrelib pcre.h /php4/ext/xml/expat/xmlparse hashtable.c xmlparse.c /php4/ext/xml/expat/xmltok xmlrole.c xmltok.c |
||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-11511@lists.php.net to get a copy of this message | ||
sas Sat Mar 4 06:44:01 2000 EDT
Modified files:
/php4 php_compat.h php.h
/php4/ext/pcre/pcrelib pcre.h
/php4/ext/xml/expat/xmlparse hashtable.c xmlparse.c
/php4/ext/xml/expat/xmltok xmlrole.c xmltok.c
Log:
Prefix some symbols with php_
^(pcre|Xml|XML).*
Index: php4/php.h
diff -u php4/php.h:1.65 php4/php.h:1.66
--- php4/php.h:1.65 Sat Feb 19 15:21:25 2000
+++ php4/php.h Sat Mar 4 06:44:00 2000
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.65 2000/02/19 23:21:25 zeev Exp $ */
+/* $Id: php.h,v 1.66 2000/03/04 14:44:00 sas Exp $ */
#ifndef _PHP_H
#define _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
Index: php4/ext/pcre/pcrelib/pcre.h
diff -u php4/ext/pcre/pcrelib/pcre.h:1.4 php4/ext/pcre/pcrelib/pcre.h:1.5
--- php4/ext/pcre/pcrelib/pcre.h:1.4 Tue Sep 14 12:24:37 1999
+++ php4/ext/pcre/pcrelib/pcre.h Sat Mar 4 06:44:00 2000
@@ -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
Index: php4/ext/xml/expat/xmlparse/hashtable.c
diff -u php4/ext/xml/expat/xmlparse/hashtable.c:1.1 php4/ext/xml/expat/xmlparse/hashtable.c:1.2
--- php4/ext/xml/expat/xmlparse/hashtable.c:1.1 Wed Feb 2 10:42:03 2000
+++ php4/ext/xml/expat/xmlparse/hashtable.c Sat Mar 4 06:44:01 2000
@@ -28,6 +28,8 @@
your version of this file under either the MPL or the GPL.
*/
+#include "php_compat.h"
+
#include "xmldef.h"
#ifdef XML_UNICODE_WCHAR_T
Index: php4/ext/xml/expat/xmlparse/xmlparse.c
diff -u php4/ext/xml/expat/xmlparse/xmlparse.c:1.2 php4/ext/xml/expat/xmlparse/xmlparse.c:1.3
--- php4/ext/xml/expat/xmlparse/xmlparse.c:1.2 Fri Feb 11 05:25:26 2000
+++ php4/ext/xml/expat/xmlparse/xmlparse.c Sat Mar 4 06:44:01 2000
@@ -28,6 +28,8 @@
your version of this file under either the MPL or the GPL.
*/
+#include "php_compat.h"
+
#include "xmldef.h"
#include "xmlparse.h"
Index: php4/ext/xml/expat/xmltok/xmlrole.c
diff -u php4/ext/xml/expat/xmltok/xmlrole.c:1.1 php4/ext/xml/expat/xmltok/xmlrole.c:1.2
--- php4/ext/xml/expat/xmltok/xmlrole.c:1.1 Wed Feb 2 10:42:04 2000
+++ php4/ext/xml/expat/xmltok/xmlrole.c Sat Mar 4 06:44:01 2000
@@ -28,6 +28,8 @@
your version of this file under either the MPL or the GPL.
*/
+#include "php_compat.h"
+
#include "xmldef.h"
#include "xmlrole.h"
Index: php4/ext/xml/expat/xmltok/xmltok.c
diff -u php4/ext/xml/expat/xmltok/xmltok.c:1.2 php4/ext/xml/expat/xmltok/xmltok.c:1.3
--- php4/ext/xml/expat/xmltok/xmltok.c:1.2 Fri Feb 11 05:23:30 2000
+++ php4/ext/xml/expat/xmltok/xmltok.c Sat Mar 4 06:44:01 2000
@@ -28,6 +28,8 @@
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"