summaryrefslogtreecommitdiff
path: root/ext/xmlreader
diff options
context:
space:
mode:
Diffstat (limited to 'ext/xmlreader')
-rw-r--r--ext/xmlreader/config.w321
-rw-r--r--ext/xmlreader/php_xmlreader.c1
-rw-r--r--ext/xmlreader/php_xmlreader.h2
3 files changed, 3 insertions, 1 deletions
diff --git a/ext/xmlreader/config.w32 b/ext/xmlreader/config.w32
index 703f2bc4df..060a0cbb73 100644
--- a/ext/xmlreader/config.w32
+++ b/ext/xmlreader/config.w32
@@ -10,5 +10,6 @@ if (PHP_XMLREADER == "yes" && PHP_LIBXML == "yes") {
ADD_FLAG("CFLAGS_XMLREADER", "/D LIBXML_STATIC");
}
ADD_EXTENSION_DEP('xmlreader', 'libxml');
+ ADD_EXTENSION_DEP('xmlreader', 'dom');
}
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index b572c85ada..338682702e 100644
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -29,6 +29,7 @@
#include "php_xmlreader.h"
#ifdef HAVE_DOM
#include "ext/dom/xml_common.h"
+#include "ext/dom/dom_ce.h"
#endif
#include <libxml/xmlreader.h>
#include <libxml/uri.h>
diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h
index e07c126c8e..3f7bf3d64e 100644
--- a/ext/xmlreader/php_xmlreader.h
+++ b/ext/xmlreader/php_xmlreader.h
@@ -34,7 +34,7 @@ extern zend_module_entry xmlreader_module_entry;
/* If xmlreader and dom both are compiled statically,
no DLL import should be used in xmlreader for dom symbols. */
#ifdef PHP_WIN32
-# if defined(HAVE_DOM) && !defined(COMPILE_DL_DOM)
+# if defined(HAVE_DOM) && !defined(COMPILE_DL_DOM) && !defined(COMPILE_DL_XMLREADER)
# define DOM_LOCAL_DEFINES 1
# endif
#endif