cvs: php4 /sapi/pi3web php4pi3web.dsp pi3web_sapi.c
| From: | Edin Kadribasic | Date: | Sun, 15 Jun 2003 23:47:18 +0000 |
| Subject: | cvs: php4 /sapi/pi3web php4pi3web.dsp pi3web_sapi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21764@lists.php.net to get a copy of this message | ||
edink Sun Jun 15 19:47:18 2003 EDT
Modified files:
/php4/sapi/pi3web php4pi3web.dsp pi3web_sapi.c
Log:
Fixed win32 build
Index: php4/sapi/pi3web/php4pi3web.dsp
diff -u php4/sapi/pi3web/php4pi3web.dsp:1.3 php4/sapi/pi3web/php4pi3web.dsp:1.4
--- php4/sapi/pi3web/php4pi3web.dsp:1.3 Sat Apr 19 12:11:36 2003
+++ php4/sapi/pi3web/php4pi3web.dsp Sun Jun 15 19:47:18 2003
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "php4pi3web_EXPORTS"
/YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I
"..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D
"_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "ZTS"
/D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX
/FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "...\..\include" /I "..\..\win32" /I
"..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D
"_DEBUG" /D ZEND_DEBUG=1 /D "_WINDOWS" /D "_USRDLL" /D "ZTS"
/D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D
"PHP4PI3WEB_EXPORTS" /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"
@@ -70,7 +70,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 "php4pi3web_EXPORTS"
/YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I
"..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D
"NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "ZTS"
/D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /FR /YX
/FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "...\..\include" /I "..\..\win32" /I
"..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D
"NDEBUG" /D ZEND_DEBUG=0 /D "_WINDOWS" /D "_USRDLL" /D "ZTS"
/D "ZEND_WIN32" /D "PHP_WIN32" /D "WIN32" /D "_MBCS" /D
"PHP4PI3WEB_EXPORTS" /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"
Index: php4/sapi/pi3web/pi3web_sapi.c
diff -u php4/sapi/pi3web/pi3web_sapi.c:1.54 php4/sapi/pi3web/pi3web_sapi.c:1.55
--- php4/sapi/pi3web/pi3web_sapi.c:1.54 Tue Jun 10 16:03:45 2003
+++ php4/sapi/pi3web/pi3web_sapi.c Sun Jun 15 19:47:18 2003
@@ -21,11 +21,10 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pi3web_sapi.c,v 1.54 2003/06/10 20:03:45 imajes Exp $ */
+/* $Id: pi3web_sapi.c,v 1.55 2003/06/15 23:47:18 edink Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-#include "pi3web_sapi.h"
#include "php.h"
#include "php_main.h"
#include "php_variables.h"
@@ -40,6 +39,8 @@
#include "PiAPI.h"
#include "Pi3API.h"
+#include "pi3web_sapi.h"
+
#define PI3WEB_SERVER_VAR_BUF_SIZE 1024
int IWasLoaded=0;
@@ -78,7 +79,7 @@
PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n");
PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR
"\">Pi3Web Server Information</th></tr>\n");
php_info_print_table_header(2, "Information Field", "Value");
- php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v
1.54 2003/06/10 20:03:45 imajes Exp $");
+ php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v
1.55 2003/06/15 23:47:18 edink Exp $");
php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp());
snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled());
php_info_print_table_row(2, "Debug Enabled", variable_buf);