summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Zimmermann <holger@php.net>2003-04-19 16:11:36 +0000
committerHolger Zimmermann <holger@php.net>2003-04-19 16:11:36 +0000
commit93a53656a5f306a5fb0859c041c138a7bb3a25d9 (patch)
tree1a72256e73db244bcf42ab8d0db62f91d19c56f5
parentde76ceb2d300f7a4e6bde5edfe59d658043a4096 (diff)
downloadphp-git-93a53656a5f306a5fb0859c041c138a7bb3a25d9.tar.gz
Added PHP4PI3WEB_EXPORTS in order to control exports/imports on Win32
-rw-r--r--sapi/pi3web/php4pi3web.dsp2
-rw-r--r--sapi/pi3web/pi3web_sapi.c10
-rw-r--r--sapi/pi3web/pi3web_sapi.h8
3 files changed, 9 insertions, 11 deletions
diff --git a/sapi/pi3web/php4pi3web.dsp b/sapi/pi3web/php4pi3web.dsp
index ec1c2806a3..6519f54be4 100644
--- a/sapi/pi3web/php4pi3web.dsp
+++ b/sapi/pi3web/php4pi3web.dsp
@@ -97,7 +97,7 @@ LINK32=link.exe
# 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" /I "..\..\..\PiAPI" /I "..\..\..\Pi2API" /I "..\..\..\Pi3API" /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 "...\..\include" /I "..\..\win32" /I "..\..\Zend" /I "..\.." /I "..\..\main" /I "..\..\TSRM" /D "NDEBUG" /D ZEND_DEBUG=0 /D "ZEND_WIN32_FORCE_INLINE" /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 "ZEND_WIN32_FORCE_INLINE" /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 0x409 /d "NDEBUG"
diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index f11d59338d..3c223752ea 100644
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -40,9 +40,7 @@
#include "PiAPI.h"
#include "Pi3API.h"
-#define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION")
#define PI3WEB_SERVER_VAR_BUF_SIZE 1024
-#define PI3WEB_POST_DATA_BUF 1024
int IWasLoaded=0;
@@ -233,7 +231,7 @@ static int sapi_pi3web_read_post(char *buffer, uint count_bytes TSRMLS_DC)
DWORD read_from_input=0;
DWORD total_read=0;
- if (SG(read_post_bytes) < lpCB->cbAvailable) {
+ if ((DWORD)SG(read_post_bytes) < lpCB->cbAvailable) {
read_from_buf = MIN(lpCB->cbAvailable-SG(read_post_bytes), count_bytes);
memcpy(buffer, lpCB->lpbData+SG(read_post_bytes), read_from_buf);
total_read += read_from_buf;
@@ -385,7 +383,7 @@ static sapi_module_struct pi3web_sapi_module = {
STANDARD_SAPI_MODULE_PROPERTIES
};
-DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
+MODULE_API DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
{
zend_file_handle file_handle;
int iRet = PIAPI_COMPLETED;
@@ -454,7 +452,7 @@ DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB)
return iRet;
}
-BOOL PHP4_startup() {
+MODULE_API BOOL PHP4_startup() {
tsrm_startup(1, 1, 0, NULL);
sapi_startup(&pi3web_sapi_module);
if (pi3web_sapi_module.startup) {
@@ -464,7 +462,7 @@ BOOL PHP4_startup() {
return IWasLoaded;
};
-BOOL PHP4_shutdown() {
+MODULE_API BOOL PHP4_shutdown() {
if (pi3web_sapi_module.shutdown) {
pi3web_sapi_module.shutdown(&pi3web_sapi_module);
};
diff --git a/sapi/pi3web/pi3web_sapi.h b/sapi/pi3web/pi3web_sapi.h
index 36e08e7982..d1c38d744e 100644
--- a/sapi/pi3web/pi3web_sapi.h
+++ b/sapi/pi3web/pi3web_sapi.h
@@ -4,7 +4,7 @@
#ifdef PHP_WIN32
# include <windows.h>
# include <httpext.h>
-# ifdef SAPI_EXPORTS
+# ifdef PHP4PI3WEB_EXPORTS
# define MODULE_API __declspec(dllexport)
# else
# define MODULE_API __declspec(dllimport)
@@ -79,9 +79,9 @@ typedef struct _CONTROL_BLOCK {
} CONTROL_BLOCK, *LPCONTROL_BLOCK;
-DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB);
-BOOL PHP4_startup();
-BOOL PHP4_shutdown();
+MODULE_API DWORD PHP4_wrapper(LPCONTROL_BLOCK lpCB);
+MODULE_API BOOL PHP4_startup();
+MODULE_API BOOL PHP4_shutdown();
// the following type declaration is for the server side
typedef DWORD ( * PFN_WRAPPERFUNC )( CONTROL_BLOCK *pCB );