sniper Thu Apr 21 07:19:53 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/libxml php_libxml.h
Log:
MFH: - Possible fix for bug #32778
http://cvs.php.net/diff.php/php-src/ext/libxml/php_libxml.h?r1=1.8.2.3&r2=1.8.2.4&ty=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.8.2.3
php-src/ext/libxml/php_libxml.h:1.8.2.4
--- php-src/ext/libxml/php_libxml.h:1.8.2.3 Tue Nov 9 03:13:04 2004
+++ php-src/ext/libxml/php_libxml.h Thu Apr 21 07:19:53 2005
@@ -17,19 +17,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_libxml.h,v 1.8.2.3 2004/11/09 08:13:04 dmitry Exp $ */
+/* $Id: php_libxml.h,v 1.8.2.4 2005/04/21 11:19:53 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)
@@ -84,9 +79,9 @@
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 @@
#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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
