From 0c5d3db79b049996da7f75a8afa35fd2524036ba Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Mon, 1 Jul 2024 11:22:58 -0700 Subject: [PATCH] Fix includes for separate builds for ext/dom (#14752) * Update include declaration in Dom css selectors May fix https://github.com/php/php-src/commit/88da91491069e7c16de4bbdd832546400c57bd20#r143708340 * Remove pointless guards * Fix Windows build * Use relative path --- ext/dom/lexbor/lexbor/selectors-adapted/selectors.c | 6 +++--- ext/dom/xpath_callbacks.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ext/dom/lexbor/lexbor/selectors-adapted/selectors.c b/ext/dom/lexbor/lexbor/selectors-adapted/selectors.c index aa11a348484..8bd996a3910 100644 --- a/ext/dom/lexbor/lexbor/selectors-adapted/selectors.c +++ b/ext/dom/lexbor/lexbor/selectors-adapted/selectors.c @@ -14,9 +14,9 @@ #include #include "lexbor/selectors-adapted/selectors.h" -#include "ext/dom/namespace_compat.h" -#include "ext/dom/domexception.h" -#include "ext/dom/php_dom.h" +#include "../../../namespace_compat.h" +#include "../../../domexception.h" +#include "../../../php_dom.h" #include diff --git a/ext/dom/xpath_callbacks.h b/ext/dom/xpath_callbacks.h index 5691c03fa0c..3a4d8731f47 100644 --- a/ext/dom/xpath_callbacks.h +++ b/ext/dom/xpath_callbacks.h @@ -17,8 +17,6 @@ #ifndef PHP_DOM_XPATH_CALLBACKS_H #define PHP_DOM_XPATH_CALLBACKS_H -#if defined(HAVE_LIBXML) && defined(HAVE_DOM) - #include #include "xml_common.h" @@ -65,4 +63,3 @@ PHP_DOM_EXPORT zend_result php_dom_xpath_callbacks_call_php_ns(php_dom_xpath_cal 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); #endif -#endif