cvs: php4 /ext/domxml domxml.dsp php_domxml.h
| From: | Brad LaFountain | Date: | Fri, 31 May 2002 13:38:58 +0000 |
| Subject: | cvs: php4 /ext/domxml domxml.dsp php_domxml.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12185@lists.php.net to get a copy of this message | ||
rodif_bl Fri May 31 09:38:58 2002 EDT
Modified files:
/php4/ext/domxml domxml.dsp php_domxml.h
Log:
Changed PHP_EXPORTS to DOMXML_EXPORTS as Edin Kadribasic suggested
Index: php4/ext/domxml/domxml.dsp
diff -u php4/ext/domxml/domxml.dsp:1.5 php4/ext/domxml/domxml.dsp:1.6
--- php4/ext/domxml/domxml.dsp:1.5 Fri May 31 02:01:50 2002
+++ php4/ext/domxml/domxml.dsp Fri May 31 09:38:58 2002
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I
"..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "COMPILE_DL_DOMXML" /D ZTS=1 /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"..\..\TSRM" /I "..\..\main" /D "WIN32" /D "DOMXML_EXPORTS"
/D "COMPILE_DL_DOMXML" /D ZTS=1 /D HAVE_DOMXML=1 /D ZEND_DEBUG=0 /D
"PHP_EXPORTS" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"..\..\TSRM" /I "..\..\main" /D "WIN32" /D "DOMXML_EXPORTS"
/D "COMPILE_DL_DOMXML" /D ZTS=1 /D HAVE_DOMXML=1 /D ZEND_DEBUG=0 /D
"DOMXML_EXPORTS" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x406 /d "NDEBUG"
@@ -72,7 +72,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"..\..\TSRM" /I "mssql-70" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_DOMXML" /D
ZTS=1 /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D
"DOMXML_EXPORTS" /D "PHP_EXPORTS" /D "COMPILE_DL_DOMXML" /D ZTS=1 /D
"ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DOMXML=1 /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"..\..\TSRM" /I "..\..\main" /D ZEND_DEBUG=1 /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D
"DOMXML_EXPORTS" /D "DOMXML_EXPORTS" /D "COMPILE_DL_DOMXML" /D ZTS=1
/D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_DOMXML=1 /FR /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x406 /d "NDEBUG"
Index: php4/ext/domxml/php_domxml.h
diff -u php4/ext/domxml/php_domxml.h:1.54 php4/ext/domxml/php_domxml.h:1.55
--- php4/ext/domxml/php_domxml.h:1.54 Fri May 31 01:58:40 2002
+++ php4/ext/domxml/php_domxml.h Fri May 31 09:38:58 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.h,v 1.54 2002/05/31 05:58:40 rodif_bl Exp $ */
+/* $Id: php_domxml.h,v 1.55 2002/05/31 13:38:58 rodif_bl Exp $ */
#ifndef PHP_DOMXML_H
#define PHP_DOMXML_H
@@ -55,6 +55,17 @@
extern zend_module_entry domxml_module_entry;
#define domxml_module_ptr &domxml_module_entry
+
+#ifdef PHP_WIN32
+#ifdef PHPAPI
+#undef PHPAPI
+#endif
+#ifdef DOMXML_EXPORTS
+#define PHPAPI __declspec(dllexport)
+#else
+#define PHPAPI __declspec(dllimport)
+#endif /* DOMXML_EXPORTS */
+#endif /* PHP_WIN32 */
PHPAPI zval *php_domobject_new(xmlNodePtr obj, int *found, zval* in TSRMLS_DC);