Add ext/dom and ext/simplexml to the Win32 default build. #Apart from a linker error...

diff --git a/main/config.w32.h b/main/config.w32.h
index 6fa5f124a6f074ea6bde1853326985e155235b93..0ca91b46ac53ddfd7cf60298268f8e9076b889b6 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -66,9 +66,11 @@
 /* Enable / Disable WDDX extension (default: enabled) */
 #define HAVE_WDDX 1
 
-/* Enable / Disable XML extension (default: enabled) */
-#define HAVE_XML 1
+/* Enable / Disable XML extensions (default: enabled) */
 #define HAVE_LIBXML 1
+#define HAVE_DOM 1
+#define HAVE_SIMPLEXML 1
+#define HAVE_XML 1
 
 /* Enable / Disable ZLIB extension (default: enabled) */
 #define HAVE_ZLIB 1

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index e0f96a6dfc34f4ce5bc79aacc8cf9c0803937bda..8baedc71676c4b4e4721183c76442805a6b3d754 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -71,12 +71,6 @@
 #if HAVE_SESSION
 #include "ext/session/php_session.h"
 #endif
-#if HAVE_XML
-#include "ext/xml/php_xml.h"
-#endif
-#if HAVE_XML && HAVE_WDDX
-#include "ext/wddx/php_wddx.h"
-#endif
 #if HAVE_MYSQL
 #include "ext/mysql/php_mysql.h"
 #endif
@@ -89,6 +83,21 @@
 #if HAVE_ZLIB
 #include "ext/zlib/php_zlib.h"
 #endif
+#if HAVE_LIBXML
+#if HAVE_DOM
+#include "ext/dom/php_dom.h"
+#endif
+#if HAVE_SIMPLEXML
+#include "ext/simplexml/php_simplexml.h"
+#endif
+#endif
+#if HAVE_XML
+#include "ext/xml/php_xml.h"
+#endif
+#if HAVE_XML && HAVE_WDDX
+#include "ext/wddx/php_wddx.h"
+#endif
+
 /* }}} */
 
 /* {{{ php_builtin_extensions[]
@@ -125,15 +134,23 @@ zend_module_entry *php_builtin_extensions[] = {
 #if HAVE_TOKENIZER
        ,phpext_tokenizer_ptr
 #endif
+#if HAVE_ZLIB
+       ,phpext_zlib_ptr
+#endif
+#if HAVE_LIBXML
+#if HAVE_DOM
+       ,phpext_dom_ptr
+#endif
+#if HAVE_SIMPLEXML
+       ,phpext_simplexml_ptr
+#endif
+#endif
 #if HAVE_XML
        ,phpext_xml_ptr
 #endif
 #if HAVE_XML && HAVE_WDDX
        ,phpext_wddx_ptr
 #endif
-#if HAVE_ZLIB
-       ,phpext_zlib_ptr
-#endif
 };
 /* }}} */
 

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 157777922f56cde82489fda042e867800c4e5122..f1c19b0d83633016ee0d5b71b7ce2680caf1ca3d 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -433,6 +433,185 @@ SOURCE=..\ext\pcre\pcrelib\pcre.h
 # End Source File\r
 # End Group\r
 # End Group\r
+\r
+# Begin Group "DOM"\r
+# Begin Group "DOM Source Files"\r
+\r
+# PROP Default_Filter ".c"\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\attr.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\cdatasection.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\characterdata.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\comment.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\document.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\documentfragment.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\documenttype.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\domconfiguration.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\domerror.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\domerrorhandler.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\domexception.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\domimplementation.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\domimplementationlist.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\domimplementationsource.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\domlocator.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\domstringlist.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\element.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\entity.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\entityreference.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\namednodemap.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\namelist.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\node.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\nodelist.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\notation.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\php_dom.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\processinginstruction.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\string_extend.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\text.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\typeinfo.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\userdatahandler.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "DOM Header Files"\r
+\r
+# PROP Default_Filter ".h"\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\dom_ce.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\dom_fe.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\dom_properties.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\php_dom.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\dom\xml_common.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "Resource Files"\r
+\r
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+# End Group\r
+# End Group\r
+\r
+# Begin Group "SimpleXML"\r
+# Begin Group "SimpleXML Source Files"\r
+\r
+# PROP Default_Filter ".c"\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\simplexml\simplexml.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "SimpleXML Header Files"\r
+\r
+# PROP Default_Filter ".h"\r
+# Begin Source File\r
+\r
+SOURCE=..\ext\simplexml\php_simplexml.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "Resource Files"\r
+\r
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+# End Group\r
+# End Group\r
+\r
 # Begin Group "Regular Expressions"\r
 \r
 # PROP Default_Filter ""\r