diff options
| author | Shane Caraveo <shane@php.net> | 2000-03-19 18:22:11 +0000 |
|---|---|---|
| committer | Shane Caraveo <shane@php.net> | 2000-03-19 18:22:11 +0000 |
| commit | 42c874ba5f94cb9b690587003251282d85efa8ab (patch) | |
| tree | 873c77e14209104ff43e60cb62ddae12a15982b9 /sapi/isapi/php4isapi.c | |
| parent | 0bf6633452aa2b91b8af7b3584177d5e178e1798 (diff) | |
| download | php-git-42c874ba5f94cb9b690587003251282d85efa8ab.tar.gz | |
do this only on win32
Diffstat (limited to 'sapi/isapi/php4isapi.c')
| -rw-r--r-- | sapi/isapi/php4isapi.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sapi/isapi/php4isapi.c b/sapi/isapi/php4isapi.c index 1200064fb9..475d3d3303 100644 --- a/sapi/isapi/php4isapi.c +++ b/sapi/isapi/php4isapi.c @@ -504,6 +504,7 @@ static void my_endthread() #endif } +#ifdef PHP_WIN32 // ___except can only call a function, so we have to do this // to retrieve the pointer. BOOL exceptionhandler(LPEXCEPTION_POINTERS *e,LPEXCEPTION_POINTERS ep) @@ -511,6 +512,7 @@ BOOL exceptionhandler(LPEXCEPTION_POINTERS *e,LPEXCEPTION_POINTERS ep) *e=ep; return TRUE; } +#endif DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { @@ -520,7 +522,9 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) CLS_FETCH(); ELS_FETCH(); PLS_FETCH(); +#ifdef PHP_WIN32 LPEXCEPTION_POINTERS e; +#endif if (setjmp(EG(bailout))!=0) { php_request_shutdown(NULL); @@ -540,8 +544,11 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) if (SG(request_info).cookie_data) { efree(SG(request_info).cookie_data); } +#ifdef PHP_WIN32 } __except(exceptionhandler(&e,GetExceptionInformation())) { -// } __except(EXCEPTION_EXECUTE_HANDLER) { +#else + } __except(EXCEPTION_EXECUTE_HANDLER) { +#endif #ifdef PHP_WIN32 char buf[1024]; if (_exception_code()==EXCEPTION_STACK_OVERFLOW) { |