rrichards Sat Dec 27 12:22:38 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/simplexml config.w32 php_simplexml.h Log: MFH: proper exports/imports for win32 http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/config.w32?r1=1.4.8.6&r2=1.4.8.7&diff_format=u Index: php-src/ext/simplexml/config.w32 diff -u php-src/ext/simplexml/config.w32:1.4.8.6 php-src/ext/simplexml/config.w32:1.4.8.7 --- php-src/ext/simplexml/config.w32:1.4.8.6 Fri Dec 26 14:13:38 2008 +++ php-src/ext/simplexml/config.w32 Sat Dec 27 12:22:38 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.4.8.6 2008/12/26 14:13:38 pajoye Exp $ +// $Id: config.w32,v 1.4.8.7 2008/12/27 12:22:38 rrichards Exp $ // vim:ft=javascript ARG_WITH("simplexml", "Simple XML support", "yes"); @@ -15,6 +15,7 @@ if (!ADD_EXTENSION_DEP('simplexml', 'spl', true)) { MESSAGE("\tSPL support in simplexml disabled"); } + ADD_FLAG("CFLAGS_SIMPLEXML", "/D PHP_SIMPLEXML_EXPORTS "); } else { PHP_SIMPLEXML == "no"; WARNING("simplexml not enabled; libraries and headers not found"); http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml.h?r1=1.20.2.2.2.3.2.5&r2=1.20.2.2.2.3.2.6&diff_format=u Index: php-src/ext/simplexml/php_simplexml.h diff -u php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.5 php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.6 --- php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.5 Sat Dec 27 01:07:49 2008 +++ php-src/ext/simplexml/php_simplexml.h Sat Dec 27 12:22:38 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.5 2008/12/27 01:07:49 rrichards Exp $ */ +/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.6 2008/12/27 12:22:38 rrichards Exp $ */ #ifndef PHP_SIMPLEXML_H #define PHP_SIMPLEXML_H @@ -77,7 +77,15 @@ #define SIMPLEXML_G(v) (simplexml_globals.v) #endif -#define PHP_SXE_API ZEND_DLEXPORT +#ifdef PHP_WIN32 +# ifdef PHP_SIMPLEXML_EXPORTS +# define PHP_SXE_API __declspec(dllexport) +# else +# define PHP_SXE_API __declspec(dllimport) +# endif +#else +# define PHP_SXE_API ZEND_API +#endif PHP_SXE_API zend_class_entry *sxe_get_element_class_entry();
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php