Skip to content

Commit 54e2275

Browse files
GirgiasGirgias
committed
Fix [-Wundef] warning in DOM extension
1 parent 532d0cb commit 54e2275

26 files changed

+45
-45
lines changed

‎ext/dom/attr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "php.h"
2323

24-
#if HAVE_LIBXML && HAVE_DOM
24+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2525

2626
#include "php_dom.h"
2727

‎ext/dom/cdatasection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/characterdata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/comment.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/document.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525
#include <libxml/SAX.h>
2626
#ifdef LIBXML_SCHEMAS_ENABLED
@@ -1621,7 +1621,7 @@ PHP_METHOD(DOMDocument, validate)
16211621
}
16221622
/* }}} */
16231623

1624-
#if defined(LIBXML_SCHEMAS_ENABLED)
1624+
#ifdef LIBXML_SCHEMAS_ENABLED
16251625
static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */
16261626
{
16271627
zval *id;
@@ -1819,7 +1819,7 @@ PHP_METHOD(DOMDocument, relaxNGValidateSource)
18191819

18201820
#endif
18211821

1822-
#if defined(LIBXML_HTML_ENABLED)
1822+
#ifdef LIBXML_HTML_ENABLED
18231823

18241824
static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
18251825
{

‎ext/dom/documentfragment.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/documenttype.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/* {{{ name string

‎ext/dom/dom_ce.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extern PHP_DOM_EXPORT zend_class_entry *dom_notation_class_entry;
3636
extern PHP_DOM_EXPORT zend_class_entry *dom_entity_class_entry;
3737
extern PHP_DOM_EXPORT zend_class_entry *dom_entityreference_class_entry;
3838
extern PHP_DOM_EXPORT zend_class_entry *dom_processinginstruction_class_entry;
39-
#if defined(LIBXML_XPATH_ENABLED)
39+
#ifdef LIBXML_XPATH_ENABLED
4040
extern PHP_DOM_EXPORT zend_class_entry *dom_xpath_class_entry;
4141
#endif
4242
extern PHP_DOM_EXPORT zend_class_entry *dom_namespace_node_class_entry;

‎ext/dom/dom_iterators.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525
#include "dom_ce.h"
2626

‎ext/dom/dom_properties.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ int dom_processinginstruction_data_write(dom_object *obj, zval *newval);
132132
/* text properties */
133133
int dom_text_whole_text_read(dom_object *obj, zval *retval);
134134

135-
#if defined(LIBXML_XPATH_ENABLED)
135+
#ifdef LIBXML_XPATH_ENABLED
136136
/* xpath properties */
137137
int dom_xpath_document_read(dom_object *obj, zval *retval);
138138
int dom_xpath_register_node_ns_read(dom_object *obj, zval *retval);

‎ext/dom/domexception.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/domimplementation.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/element.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/entity.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626

‎ext/dom/entityreference.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/namednodemap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/node.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/nodelist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/notation.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/parentnode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#endif
2222

2323
#include "php.h"
24-
#if HAVE_LIBXML && HAVE_DOM
24+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2525
#include "php_dom.h"
2626

2727
/* {{{ firstElementChild DomParentNode

‎ext/dom/php_dom.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#endif
2222

2323
#include "php.h"
24-
#if HAVE_LIBXML && HAVE_DOM
24+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2525
#include "ext/standard/php_rand.h"
2626
#include "php_dom.h"
2727
#include "php_dom_arginfo.h"
@@ -53,15 +53,15 @@ PHP_DOM_EXPORT zend_class_entry *dom_notation_class_entry;
5353
PHP_DOM_EXPORT zend_class_entry *dom_entity_class_entry;
5454
PHP_DOM_EXPORT zend_class_entry *dom_entityreference_class_entry;
5555
PHP_DOM_EXPORT zend_class_entry *dom_processinginstruction_class_entry;
56-
#if defined(LIBXML_XPATH_ENABLED)
56+
#ifdef LIBXML_XPATH_ENABLED
5757
PHP_DOM_EXPORT zend_class_entry *dom_xpath_class_entry;
5858
#endif
5959
PHP_DOM_EXPORT zend_class_entry *dom_namespace_node_class_entry;
6060
/* }}} */
6161

6262
zend_object_handlers dom_object_handlers;
6363
zend_object_handlers dom_nnodemap_object_handlers;
64-
#if defined(LIBXML_XPATH_ENABLED)
64+
#ifdef LIBXML_XPATH_ENABLED
6565
zend_object_handlers dom_xpath_object_handlers;
6666
#endif
6767

@@ -81,7 +81,7 @@ static HashTable dom_notation_prop_handlers;
8181
static HashTable dom_entity_prop_handlers;
8282
static HashTable dom_processinginstruction_prop_handlers;
8383
static HashTable dom_namespace_node_prop_handlers;
84-
#if defined(LIBXML_XPATH_ENABLED)
84+
#ifdef LIBXML_XPATH_ENABLED
8585
static HashTable dom_xpath_prop_handlers;
8686
#endif
8787
/* }}} */
@@ -551,7 +551,7 @@ static zval *dom_nodelist_read_dimension(zend_object *object, zval *offset, int
551551
static int dom_nodelist_has_dimension(zend_object *object, zval *member, int check_empty);
552552
static zend_object *dom_objects_store_clone_obj(zend_object *zobject);
553553
static void dom_nnodemap_object_dtor(zend_object *object);
554-
#if defined(LIBXML_XPATH_ENABLED)
554+
#ifdef LIBXML_XPATH_ENABLED
555555
void dom_xpath_objects_free_storage(zend_object *object);
556556
#endif
557557

@@ -780,7 +780,7 @@ PHP_MINIT_FUNCTION(dom)
780780
zend_hash_merge(&dom_processinginstruction_prop_handlers, &dom_node_prop_handlers, dom_copy_prop_handler, 0);
781781
zend_hash_add_ptr(&classes, ce.name, &dom_processinginstruction_prop_handlers);
782782

783-
#if defined(LIBXML_XPATH_ENABLED)
783+
#ifdef LIBXML_XPATH_ENABLED
784784
memcpy(&dom_xpath_object_handlers, &dom_object_handlers, sizeof(zend_object_handlers));
785785
dom_xpath_object_handlers.offset = XtOffsetOf(dom_xpath_object, dom) + XtOffsetOf(dom_object, std);
786786
dom_xpath_object_handlers.free_obj = dom_xpath_objects_free_storage;
@@ -859,13 +859,13 @@ PHP_MINFO_FUNCTION(dom)
859859
php_info_print_table_row(2, "DOM/XML", "enabled");
860860
php_info_print_table_row(2, "DOM/XML API Version", DOM_API_VERSION);
861861
php_info_print_table_row(2, "libxml Version", LIBXML_DOTTED_VERSION);
862-
#if defined(LIBXML_HTML_ENABLED)
862+
#ifdef LIBXML_HTML_ENABLED
863863
php_info_print_table_row(2, "HTML Support", "enabled");
864864
#endif
865-
#if defined(LIBXML_XPATH_ENABLED)
865+
#ifdef LIBXML_XPATH_ENABLED
866866
php_info_print_table_row(2, "XPath Support", "enabled");
867867
#endif
868-
#if defined(LIBXML_XPTR_ENABLED)
868+
#ifdef LIBXML_XPTR_ENABLED
869869
php_info_print_table_row(2, "XPointer Support", "enabled");
870870
#endif
871871
#ifdef LIBXML_SCHEMAS_ENABLED
@@ -892,7 +892,7 @@ PHP_MSHUTDOWN_FUNCTION(dom) /* {{{ */
892892
zend_hash_destroy(&dom_notation_prop_handlers);
893893
zend_hash_destroy(&dom_entity_prop_handlers);
894894
zend_hash_destroy(&dom_processinginstruction_prop_handlers);
895-
#if defined(LIBXML_XPATH_ENABLED)
895+
#ifdef LIBXML_XPATH_ENABLED
896896
zend_hash_destroy(&dom_xpath_prop_handlers);
897897
#endif
898898
zend_hash_destroy(&classes);
@@ -941,7 +941,7 @@ void node_list_unlink(xmlNodePtr node)
941941
}
942942
/* }}} end node_list_unlink */
943943

944-
#if defined(LIBXML_XPATH_ENABLED)
944+
#ifdef LIBXML_XPATH_ENABLED
945945
/* {{{ dom_xpath_objects_free_storage */
946946
void dom_xpath_objects_free_storage(zend_object *object)
947947
{
@@ -1035,7 +1035,7 @@ zend_object *dom_objects_new(zend_class_entry *class_type)
10351035
}
10361036
/* }}} */
10371037

1038-
#if defined(LIBXML_XPATH_ENABLED)
1038+
#ifdef LIBXML_XPATH_ENABLED
10391039
/* {{{ zend_object dom_xpath_objects_new(zend_class_entry *class_type) */
10401040
zend_object *dom_xpath_objects_new(zend_class_entry *class_type)
10411041
{

‎ext/dom/php_dom.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ extern zend_module_entry dom_module_entry;
3434
#include <libxml/xinclude.h>
3535
#include <libxml/hash.h>
3636
#include <libxml/c14n.h>
37-
#if defined(LIBXML_HTML_ENABLED)
37+
#ifdef LIBXML_HTML_ENABLED
3838
#include <libxml/HTMLparser.h>
3939
#include <libxml/HTMLtree.h>
4040
#endif
41-
#if defined(LIBXML_XPATH_ENABLED)
41+
#ifdef LIBXML_XPATH_ENABLED
4242
#include <libxml/xpath.h>
4343
#include <libxml/xpathInternals.h>
4444
#endif
45-
#if defined(LIBXML_XPTR_ENABLED)
45+
#ifdef LIBXML_XPTR_ENABLED
4646
#include <libxml/xpointer.h>
4747
#endif
4848
#ifdef PHP_WIN32
@@ -99,7 +99,7 @@ dom_object *dom_object_get_data(xmlNodePtr obj);
9999
dom_doc_propsptr dom_get_doc_props(php_libxml_ref_obj *document);
100100
zend_object *dom_objects_new(zend_class_entry *class_type);
101101
zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type);
102-
#if defined(LIBXML_XPATH_ENABLED)
102+
#ifdef LIBXML_XPATH_ENABLED
103103
zend_object *dom_xpath_objects_new(zend_class_entry *class_type);
104104
#endif
105105
int dom_get_strict_error(php_libxml_ref_obj *document);

‎ext/dom/php_dom.stub.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public function registerNodeClass(string $baseclass, ?string $extendedclass) {}
306306
/** @return int|false */
307307
public function save(string $filename, int $options = 0) {}
308308

309-
#if defined(LIBXML_HTML_ENABLED)
309+
#ifdef LIBXML_HTML_ENABLED
310310
/** @return DOMDocument|bool */
311311
public function loadHTML(string $source, int $options = 0) {}
312312

@@ -323,7 +323,7 @@ public function saveHTMLFile(string $filename) {}
323323
/** @return string|false */
324324
public function saveXML(?DOMNode $node = null, int $options = 0) {}
325325

326-
#if defined(LIBXML_SCHEMAS_ENABLED)
326+
#ifdef LIBXML_SCHEMAS_ENABLED
327327
/** @return bool */
328328
public function schemaValidate(string $filename, int $flags = 0) {}
329329

@@ -407,7 +407,7 @@ class DOMProcessingInstruction
407407
public function __construct(string $name, string $value = "") {}
408408
}
409409

410-
#if defined(LIBXML_XPATH_ENABLED)
410+
#ifdef LIBXML_XPATH_ENABLED
411411
class DOMXPath
412412
{
413413
public function __construct(DOMDocument $doc, bool $registerNodeNS = true) {}

‎ext/dom/processinginstruction.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
/*

‎ext/dom/text.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525
#include "dom_ce.h"
2626

‎ext/dom/xpath.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#endif
2121

2222
#include "php.h"
23-
#if HAVE_LIBXML && HAVE_DOM
23+
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
2424
#include "php_dom.h"
2525

2626
#define PHP_DOM_XPATH_QUERY 0
@@ -30,7 +30,7 @@
3030
* class DOMXPath
3131
*/
3232

33-
#if defined(LIBXML_XPATH_ENABLED)
33+
#ifdef LIBXML_XPATH_ENABLED
3434

3535
static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int type) /* {{{ */
3636
{

0 commit comments

Comments
 (0)