edink Tue Nov 23 07:14:20 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/iconv iconv.dsp php_iconv.h
Log:
(Sort of) MFH: export PHP iconv symbols using the old build too
http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.dsp?r1=1.4.2.2&r2=1.4.2.3&ty=u
Index: php-src/ext/iconv/iconv.dsp
diff -u php-src/ext/iconv/iconv.dsp:1.4.2.2 php-src/ext/iconv/iconv.dsp:1.4.2.3
--- php-src/ext/iconv/iconv.dsp:1.4.2.2 Tue Aug 3 18:06:15 2004
+++ php-src/ext/iconv/iconv.dsp Tue Nov 23 07:14:20 2004
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "ICONV_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM"
/I "..\..\main" /I "..\..\win32" /I "..\..\..\php_build\iconv\include" /D
"WIN32" /D "PHP_EXPORTS" /D "COMPILE_DL_ICONV" /D "HAVE_ICONV" /D ZEND_DEBUG=0
/D "NDEBUG" /D "_WINDOWS" /D "ZEND_WIN32" /D "PHP_WIN32" /D ZTS=1 /D
"ICONV_SUPPORTS_ERRNO" /D "HAVE_LIBICONV" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\TSRM"
/I "..\..\main" /I "..\..\win32" /I "..\..\..\php_build\iconv\include" /D
ZEND_DEBUG=0 /D "ICONV_SUPPORTS_ERRNO" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D
"PHP_EXPORTS" /D "COMPILE_DL_ICONV" /D "ZEND_WIN32" /D "PHP_WIN32" /D
"HAVE_ICONV" /D ZTS=1 /D "HAVE_LIBICONV" /D "PHP_ICONV_EXPORTS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICONV_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"..\..\TSRM" /I "..\..\main" /I "..\..\win32" /I
"..\..\..\php_build\iconv\include" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_ICONV" /D "ZEND_WIN32" /D
"PHP_WIN32" /D "HAVE_ICONV" /D ZTS=1 /D "HAVE_LIBICONV" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"..\..\TSRM" /I "..\..\main" /I "..\..\win32" /I
"..\..\..\php_build\iconv\include" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "PHP_EXPORTS" /D "COMPILE_DL_ICONV" /D "ZEND_WIN32" /D
"PHP_WIN32" /D "HAVE_ICONV" /D ZTS=1 /D "HAVE_LIBICONV" /D "PHP_ICONV_EXPORTS"
/YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG"
http://cvs.php.net/diff.php/php-src/ext/iconv/php_iconv.h?r1=1.12.2.6&r2=1.12.2.7&ty=u
Index: php-src/ext/iconv/php_iconv.h
diff -u php-src/ext/iconv/php_iconv.h:1.12.2.6
php-src/ext/iconv/php_iconv.h:1.12.2.7
--- php-src/ext/iconv/php_iconv.h:1.12.2.6 Tue Nov 23 04:45:23 2004
+++ php-src/ext/iconv/php_iconv.h Tue Nov 23 07:14:20 2004
@@ -17,14 +17,18 @@
+----------------------------------------------------------------------+
*/
-/* $Revision: 1.12.2.6 $ */
+/* $Revision: 1.12.2.7 $ */
#ifndef PHP_ICONV_H
#define PHP_ICONV_H
#ifdef PHP_WIN32
+#ifdef PHP_ICONV_EXPORTS
#define PHP_ICONV_API __declspec(dllexport)
#else
+#define PHP_ICONV_API __declspec(dllimport)
+#endif
+#else
#define PHP_ICONV_API
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
