Fix [-Wundef] warnings in libxml extension

diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 9ec25d6190c114a96474bd273186f0b02c7d9b25..18da8b67daca850eb3cc4a706793413b016882bd 100644 (file)
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -27,7 +27,7 @@
 #include "ext/standard/info.h"
 #include "ext/standard/file.h"
 
-#if HAVE_LIBXML
+#ifdef HAVE_LIBXML
 
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
@@ -714,7 +714,7 @@ PHP_LIBXML_API void php_libxml_initialize(void)
 PHP_LIBXML_API void php_libxml_shutdown(void)
 {
        if (_php_libxml_initialized) {
-#if defined(LIBXML_SCHEMAS_ENABLED)
+#ifdef LIBXML_SCHEMAS_ENABLED
                xmlRelaxNGCleanupTypes();
 #endif
                /* xmlCleanupParser(); */
@@ -767,7 +767,7 @@ static PHP_MINIT_FUNCTION(libxml)
        REGISTER_LONG_CONSTANT("LIBXML_NOEMPTYTAG",     LIBXML_SAVE_NOEMPTYTAG, CONST_CS | CONST_PERSISTENT);
 
        /* Schema validation options */
-#if defined(LIBXML_SCHEMAS_ENABLED)
+#ifdef LIBXML_SCHEMAS_ENABLED
        REGISTER_LONG_CONSTANT("LIBXML_SCHEMA_CREATE",  XML_SCHEMA_VAL_VC_I_CREATE,     CONST_CS | CONST_PERSISTENT);
 #endif
 

diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
index f913f956d5045a29d73edcebfeb061f258103cdb..85ffcd396958b6c2e4754825480d7affe30985e4 100644 (file)
--- a/ext/libxml/php_libxml.h
+++ b/ext/libxml/php_libxml.h
@@ -18,7 +18,7 @@
 #ifndef PHP_LIBXML_H
 #define PHP_LIBXML_H
 
-#if HAVE_LIBXML
+#ifdef HAVE_LIBXML
 extern zend_module_entry libxml_module_entry;
 #define libxml_module_ptr &libxml_module_entry