Make expat and ext/xml compile again on Win32.

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index bd3baac3b813ade7da5c4343064d1a580e8a59b8..c3154b405fe01ade54fd77be3a77730bf31f1afa 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -1,26 +1,26 @@
 # Microsoft Developer Studio Project File - Name="php4dllts" - Package Owner=<4>\r
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
+# ** NICHT BEARBEITEN **\r
 \r
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 \r
 CFG=php4dllts - Win32 Debug_TS\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE\r
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl\r
 !MESSAGE \r
 !MESSAGE NMAKE /f "php4dllts.mak".\r
 !MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben\r
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:\r
 !MESSAGE \r
 !MESSAGE NMAKE /f "php4dllts.mak" CFG="php4dllts - Win32 Debug_TS"\r
 !MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
+!MESSAGE Für die Konfiguration stehen zur Auswahl:\r
 !MESSAGE \r
-!MESSAGE "php4dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "php4dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "php4dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "php4dllts - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4dllts - Win32 Debug_TS" (basierend auf  "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4dllts - Win32 Release_TS" (basierend auf  "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4dllts - Win32 Release_TS_inline" (basierend auf  "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "php4dllts - Win32 Release_TSDbg" (basierend auf  "Win32 (x86) Dynamic-Link Library")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -886,126 +886,6 @@ SOURCE=..\ext\wddx\php_wddx_api.h
 SOURCE=..\ext\xml\php_xml.h\r
 # End Source File\r
 # End Group\r
-# Begin Group "expat"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Group "Source Files No. 5"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmlparse\hashtable.c\r
-# ADD CPP /I "..\ext\xml\expat\xmltok"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmlparse\xmlparse.c\r
-# ADD CPP /I "..\ext\xml\expat\xmltok"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\xmlrole.c\r
-# ADD CPP /I "..\ext\xml\expat\xmltok"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\xmltok.c\r
-# ADD CPP /I "..\ext\xml\expat\xmltok"\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files No. 5"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\asciitab.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\iasciitab.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\latin1tab.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\nametab.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\utf8tab.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\xmldef.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmlparse\xmlparse.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\xmlrole.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\xmltok.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\xmltok_impl.c\r
-\r
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"\r
-\r
-# PROP BASE Exclude_From_Build 1\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\xmltok_impl.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\xml\expat\xmltok\xmltok_ns.c\r
-\r
-!IF  "$(CFG)" == "php4dllts - Win32 Debug_TS"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
-\r
-# PROP Exclude_From_Build 1\r
-\r
-!ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"\r
-\r
-# PROP BASE Exclude_From_Build 1\r
-# PROP Exclude_From_Build 1\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# End Group\r
-# End Group\r
 # End Group\r
 # Begin Group "FTP"\r
 \r