cvs: /php4/sapi/servlet servlet.dsp /php4/ext/java java.dsp
| From: | Sam Ruby | Date: | Fri, 11 Feb 2000 23:50:01 +0000 |
| Subject: | cvs: /php4/sapi/servlet servlet.dsp /php4/ext/java java.dsp | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-10156@lists.php.net to get a copy of this message | ||
rubys Fri Feb 11 15:50:01 2000 EDT
Modified files:
/php4/sapi/servlet servlet.dsp
/php4/ext/java java.dsp
Log:
on WIN32, PHP_WIN32 and ZEND_WIN32 need to be defined
Index: php4/sapi/servlet/servlet.dsp
diff -u php4/sapi/servlet/servlet.dsp:1.2 php4/sapi/servlet/servlet.dsp:1.3
--- php4/sapi/servlet/servlet.dsp:1.2 Sun Dec 19 13:02:54 1999
+++ php4/sapi/servlet/servlet.dsp Fri Feb 11 15:50:00 2000
@@ -44,8 +44,8 @@
# PROP Intermediate_Dir "..\..\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "PHP_WIN32" /D "ZEND_WIN32" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /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"
@@ -70,8 +70,8 @@
# PROP Intermediate_Dir "..\..\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD
/GZ /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "PHP_WIN32" /D "ZEND_WIN32"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /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"
@@ -96,8 +96,8 @@
# PROP Intermediate_Dir "..\..\Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend"
/I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D
"ZTS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend"
/I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /D "ZTS" /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"
@@ -122,8 +122,8 @@
# PROP Intermediate_Dir "..\..\Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /D "ZTS" /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"
Index: php4/ext/java/java.dsp
diff -u php4/ext/java/java.dsp:1.3 php4/ext/java/java.dsp:1.4
--- php4/ext/java/java.dsp:1.3 Sun Dec 19 13:02:43 1999
+++ php4/ext/java/java.dsp Fri Feb 11 15:50:01 2000
@@ -44,8 +44,8 @@
# PROP Intermediate_Dir "..\..\Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "PHP_WIN32" /D "ZEND_WIN32" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /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"
@@ -70,8 +70,8 @@
# PROP Intermediate_Dir "..\..\Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /FR /YX /FD
/GZ /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "PHP_WIN32" /D "ZEND_WIN32"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /D ZEND_DEBUG=1 /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"
@@ -96,8 +96,8 @@
# PROP Intermediate_Dir "..\..\Debug_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend"
/I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "WIN32" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D
"ZTS" /FR /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\..\Zend"
/I "$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "_DEBUG" /D ZEND_DEBUG=1 /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /D "ZTS" /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"
@@ -122,8 +122,8 @@
# PROP Intermediate_Dir "..\..\Release_TS"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "COMPILE_DL" /D "ZTS" /YX /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I
"$(JAVA_HOME)\include\win32" /I "$(JAVA_HOME)\include" /I
"..\..\..\bindlib_w32" /D "NDEBUG" /D "PHP_WIN32" /D
"ZEND_WIN32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D
"_USRDLL" /D "COMPILE_DL" /D "ZTS" /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"