diff options
| author | foobar <sniper@php.net> | 2005-04-21 11:19:29 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-04-21 11:19:29 +0000 |
| commit | e0c4f9b9be0916e6f6b4b51aa88e4024c5939431 (patch) | |
| tree | 0d9c4d2d3eb3055d0b15421a53c3ba278cb69748 /ext/libxml/php_libxml.h | |
| parent | bd06b244a768861955a4eb2270cf6a854c97222f (diff) | |
| download | php-git-e0c4f9b9be0916e6f6b4b51aa88e4024c5939431.tar.gz | |
- Possible fix for bug #32778
Diffstat (limited to 'ext/libxml/php_libxml.h')
| -rw-r--r-- | ext/libxml/php_libxml.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h index 429b6498d7..519dd2f308 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -22,14 +22,9 @@ #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 int php_libxml_xmlCheckUTF8(const unsigned char *s); 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 @@ PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg TSRMLS_DC) #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 */ |