From: George Peter Banyard <girgias@php.net>
Date: Fri, 15 May 2020 22:32:37 +0000 (+0200)
Subject: Fix [-Wundef] warnings in libxml extension
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35e0a91db717fe441a89ca9554d8843d8ee63112;p=php

Fix [-Wundef] warnings in libxml extension
---

diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 9ec25d6190..18da8b67da 100644
--- 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 f913f956d5..85ffcd3969 100644
--- 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