cvs: php4 /ext/xml/expat expat.dsw expat.mak winconfig.h /win32 php4dllts.dsp

dbeu Sat May 12 13:01:59 2001 EDT Added files: /php4/ext/xml/expat winconfig.h Removed files: /php4/ext/xml/expat expat.dsw expat.mak Modified files: /php4/win32 php4dllts.dsp Log: hopefully fix win32 build, untested

Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.36 php4/win32/php4dllts.dsp:1.37 --- php4/win32/php4dllts.dsp:1.36 Sat May 12 11:36:13 2001 +++ php4/win32/php4dllts.dsp Sat May 12 13:01:59 2001 @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /I "..\ext\xml\expat" /D "_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "HAVE_LIBEXPAT2" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "_DEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /I "..\ext\xml\expat" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "HAVE_LIBEXPAT2" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -98,7 +98,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "regex" /I "..\bindlib_w32" /I "Zend" /I "tsrm" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "MSVC5" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "ZTS" /D "WIN32" /D "_MBCS" /D ZEND_DEBUG=0 /FR /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /I "..\ext\xml\expat" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "HAVE_LIBEXPAT2" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -125,7 +125,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I ".." /I "..\main" /I "..\regex" /I "..\..\bindlib_w32" /I "..\Zend" /I "..\TSRM" /I "..\ext\mysql\libmysql" /I "..\ext\xml\expat" /D "NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "PHP4DLLTS_EXPORTS" /D "PHP_EXPORTS" /D "LIBZEND_EXPORTS" /D "TSRM_EXPORTS" /D "SAPI_EXPORTS" /D "MSVC5" /D "ZTS" /D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D "HAVE_LIBEXPAT2" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x40d /d "NDEBUG" @@ -1925,6 +1925,129 @@ SOURCE=..\TODO # End Source File +# End Group +# Begin Group "Support" + +# PROP Default_Filter "" +# Begin Group "Expat" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 5" + +# PROP Default_Filter ".c" +# Begin Source File + +SOURCE=..\ext\xml\expat\xmlparse.c +# ADD CPP /D "COMPILED_FROM_DSP" +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\xmlrole.c +# ADD CPP /D "COMPILED_FROM_DSP" +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\xmltok.c +# ADD CPP /D "COMPILED_FROM_DSP" +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\xmltok_impl.c + +!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" + +# ADD CPP /D "COMPILED_FROM_DSP" + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" + +# ADD CPP /D "COMPILED_FROM_DSP" + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" + +# PROP Exclude_From_Build 1 +# ADD CPP /D "COMPILED_FROM_DSP" + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" + +# ADD CPP /D "COMPILED_FROM_DSP" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\xmltok_ns.c + +!IF "$(CFG)" == "php4dllts - Win32 Debug_TS" + +# ADD CPP /D "COMPILED_FROM_DSP" + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" + +# ADD CPP /D "COMPILED_FROM_DSP" + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" + +# PROP Exclude_From_Build 1 +# ADD CPP /D "COMPILED_FROM_DSP" + +!ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" + +# ADD CPP /D "COMPILED_FROM_DSP" + +!ENDIF + +# End Source File +# End Group +# Begin Group "Header Files No. 5" + +# PROP Default_Filter ".h" +# Begin Source File + +SOURCE=..\ext\xml\expat\ascii.h +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\asciitab.h +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\expat.h +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\iasciitab.h +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\latin1tab.h +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\nametab.h +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\utf8tab.h +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\winconfig.h +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\xmlrole.h +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\xmltok.h +# End Source File +# Begin Source File + +SOURCE=..\ext\xml\expat\xmltok_impl.h +# End Source File +# End Group +# End Group # End Group # End Target # End Project Index: php4/ext/xml/expat/winconfig.h +++ php4/ext/xml/expat/winconfig.h /*================================================================ ** Copyright 2000, Clark Cooper ** All rights reserved. ** ** This is free software. You are permitted to copy, distribute, or modify ** it under the terms of the MIT/X license (contained in the COPYING file ** with this distribution.) ** ** */ #ifndef WINCONFIG_H #define WINCONFIG_H #define WIN32_LEAN_AND_MEAN #include <windows.h> #undef WIN32_LEAN_AND_MEAN #include <memory.h> #include <string.h> #define XML_NS 1 #define XML_DTD 1 #define XML_BYTE_ORDER 12 #define XML_CONTEXT_BYTES 1024 #endif /* ndef WINCONFIG_H */