cvs: php-src /ext/libxml php_libxml.h

sniper Thu Apr 21 07:19:31 2005 EDT Modified files: /php-src/ext/libxml php_libxml.h Log: - Possible fix for bug #32778 http://cvs.php.net/diff.php/php-src/ext/libxml/php_libxml.h?r1=1.13&r2=1.14&ty=u Index: php-src/ext/libxml/php_libxml.h diff -u php-src/ext/libxml/php_libxml.h:1.13 php-src/ext/libxml/php_libxml.h:1.14 --- php-src/ext/libxml/php_libxml.h:1.13 Sun Feb 20 16:49:45 2005 +++ php-src/ext/libxml/php_libxml.h Thu Apr 21 07:19:29 2005 @@ -17,19 +17,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_libxml.h,v 1.13 2005/02/20 21:49:45 rrichards Exp $ */ +/* $Id: php_libxml.h,v 1.14 2005/04/21 11:19:29 sniper Exp $ */ #ifndef PHP_LIBXML_H #define PHP_LIBXML_H -#ifdef HAVE_LIBXML +#if HAVE_LIBXML extern zend_module_entry libxml_module_entry; #define libxml_module_ptr &libxml_module_entry -#else -#define libxml_module_ptr NULL -#endif - -#ifdef HAVE_LIBXML #ifdef PHP_WIN32 #define PHP_LIBXML_API __declspec(dllexport) @@ -90,9 +85,9 @@ PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC); PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg TSRMLS_DC); -#endif /* HAVE_LIBXML */ - -#define phpext_libxml_ptr libxml_module_ptr +/* Init/shutdown functions*/ +PHP_LIBXML_API void php_libxml_initialize(); +PHP_LIBXML_API void php_libxml_shutdown(); #ifdef ZTS #define LIBXML(v) TSRMG(libxml_globals_id, php_libxml_globals *, v) @@ -100,8 +95,11 @@ #define LIBXML(v) (libxml_globals.v) #endif -PHP_LIBXML_API void php_libxml_initialize(); -PHP_LIBXML_API void php_libxml_shutdown(); +#else /* HAVE_LIBXML */ +#define libxml_module_ptr NULL +#endif + +#define phpext_libxml_ptr libxml_module_ptr #endif /* PHP_LIBXML_H */