Fix Win32 build. (Lots of linkage warnings remain!)

diff --git a/ext/xml/expat/xmlparse.c b/ext/xml/expat/xmlparse.c
index 47f08099ff015c5b54d7404619b373abcc22ca9f..ef1ec022f6faf00fc2dfe744760132bf309913df 100644 (file)
--- a/ext/xml/expat/xmlparse.c
+++ b/ext/xml/expat/xmlparse.c
@@ -4,7 +4,11 @@
 
 #include <stddef.h>
 #include <string.h>                     /* memset(), memcpy() */
-#include <php_config.h>
+#if PHP_WIN32
+#include "config.w32.h"
+#else
+#include "php_config.h"
+#endif
 #include "php_compat.h"
 
 #ifdef COMPILED_FROM_DSP

diff --git a/ext/xml/expat/xmlrole.c b/ext/xml/expat/xmlrole.c
index d81cba5a2ff5b47fff6e7e92d9a0febcd78657db..d9a2367087cf042d5e8c1c925f1dc1bb8e4d863b 100644 (file)
--- a/ext/xml/expat/xmlrole.c
+++ b/ext/xml/expat/xmlrole.c
@@ -2,7 +2,11 @@
    See the file COPYING for copying permission.
 */
 
-#include <php_config.h>
+#if PHP_WIN32
+#include "config.w32.h"
+#else
+#include "php_config.h"
+#endif
 #include "php_compat.h"
 
 #ifdef COMPILED_FROM_DSP

diff --git a/ext/xml/expat/xmltok.c b/ext/xml/expat/xmltok.c
index 639fb4c56b08868a028d6bc0281b9a6b241c5438..0a11e56748aed849df3ca8fa210694eafaf959a6 100644 (file)
--- a/ext/xml/expat/xmltok.c
+++ b/ext/xml/expat/xmltok.c
@@ -2,7 +2,11 @@
    See the file COPYING for copying permission.
 */
 
-#include <php_config.h>
+#if PHP_WIN32
+#include "config.w32.h"
+#else
+#include "php_config.h"
+#endif
 #include "php_compat.h"
 
 #ifdef COMPILED_FROM_DSP