From: Sebastian Bergmann <sebastian@php.net>
Date: Wed, 25 Jun 2003 21:37:50 +0000 (+0000)
Subject: Add ext/dom and ext/simplexml to the Win32 default build. #Apart from a linker error... 
X-Git-Tag: RELEASE_1_0_2~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4434c8e0d66cbb615c1d8dc424ec04aeb06fd8b1;p=php

Add ext/dom and ext/simplexml to the Win32 default build. #Apart from a linker error when HAVE_SIMPLEXML=1 is set this already works. More research, after a good night's sleep, is required ;-)
---

diff --git a/main/config.w32.h b/main/config.w32.h
index 6fa5f124a6..0ca91b46ac 100644
--- 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 e0f96a6dfc..8baedc7167 100644
--- 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 157777922f..f1c19b0d83 100644
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -433,6 +433,185 @@ SOURCE=..\ext\pcre\pcrelib\pcre.h
 # End Source File
 # End Group
 # End Group
+
+# Begin Group "DOM"
+# Begin Group "DOM Source Files"
+
+# PROP Default_Filter ".c"
+# Begin Source File
+
+SOURCE=..\ext\dom\attr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\cdatasection.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\characterdata.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\comment.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\document.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\documentfragment.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\documenttype.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domconfiguration.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domerror.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domerrorhandler.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domexception.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domimplementation.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domimplementationlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domimplementationsource.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domlocator.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\domstringlist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\element.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\entity.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\entityreference.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\namednodemap.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\namelist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\node.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\nodelist.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\notation.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\php_dom.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\processinginstruction.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\string_extend.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\text.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\typeinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\userdatahandler.c
+# End Source File
+# End Group
+# Begin Group "DOM Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=..\ext\dom\dom_ce.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\dom_fe.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\dom_properties.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\php_dom.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\ext\dom\xml_common.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Group
+
+# Begin Group "SimpleXML"
+# Begin Group "SimpleXML Source Files"
+
+# PROP Default_Filter ".c"
+# Begin Source File
+
+SOURCE=..\ext\simplexml\simplexml.c
+# End Source File
+# End Group
+# Begin Group "SimpleXML Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=..\ext\simplexml\php_simplexml.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Group
+
 # Begin Group "Regular Expressions"
 
 # PROP Default_Filter ""