MFH: - Possible fix for bug #32778

diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index a4643809e3b26b9b1546253b38389342eb123fe4..8704592f0279951a7511f57657897c6c4b7ebc38 100644 (file)
--- 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)
@@ -84,9 +79,9 @@ void php_libxml_ctx_error(void *ctx, const char *msg, ...);
 PHP_LIBXML_API int php_libxml_xmlCheckUTF8(const unsigned char *s);
 PHP_LIBXML_API zval *php_libxml_switch_context(zval *context 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)
@@ -94,8 +89,11 @@ PHP_LIBXML_API zval *php_libxml_switch_context(zval *context 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 */