Skip to content

Commit 0c5d3db

Browse files
authored
Fix includes for separate builds for ext/dom (#14752)
* Update include declaration in Dom css selectors May fix 88da914#r143708340 * Remove pointless guards * Fix Windows build * Use relative path
1 parent 1d90544 commit 0c5d3db

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

ext/dom/lexbor/lexbor/selectors-adapted/selectors.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include <php.h>
1515

1616
#include "lexbor/selectors-adapted/selectors.h"
17-
#include "ext/dom/namespace_compat.h"
18-
#include "ext/dom/domexception.h"
19-
#include "ext/dom/php_dom.h"
17+
#include "../../../namespace_compat.h"
18+
#include "../../../domexception.h"
19+
#include "../../../php_dom.h"
2020

2121
#include <math.h>
2222

ext/dom/xpath_callbacks.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#ifndef PHP_DOM_XPATH_CALLBACKS_H
1818
#define PHP_DOM_XPATH_CALLBACKS_H
1919

20-
#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
21-
2220
#include <libxml/xpathInternals.h>
2321
#include "xml_common.h"
2422

@@ -65,4 +63,3 @@ PHP_DOM_EXPORT zend_result php_dom_xpath_callbacks_call_php_ns(php_dom_xpath_cal
6563
PHP_DOM_EXPORT zend_result php_dom_xpath_callbacks_call_custom_ns(php_dom_xpath_callbacks *xpath_callbacks, xmlXPathParserContextPtr ctxt, int num_args, php_dom_xpath_nodeset_evaluation_mode evaluation_mode, dom_object *intern, php_dom_xpath_callbacks_proxy_factory proxy_factory);
6664

6765
#endif
68-
#endif

0 commit comments

Comments
 (0)