Remove code references to serverapi

diff --git a/main/main.c b/main/main.c
index e0f399ba2b038704765ac41d87fcec3388f09b1e..24a93f6ff19ca6bd75804634ed9636ab3d946a29 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -66,15 +66,6 @@
 
 #include "php_content_types.h"
 
-#if USE_SAPI
-#include "serverapi/sapi.h"
-void *gLock;
-#ifndef THREAD_SAFE
-struct sapi_request_info *sapi_rqst;
-#endif
-#endif
-
-
 #include "SAPI.h"
 
 #if MSVC5 || !defined(HAVE_GETOPT)

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 078a815de204f5cbd4c40a3c8c81f975a8668abd..3abfd6f7ad5aaf2311b8a4d8cce662a0a8a392ed 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -69,14 +69,6 @@
 #include "zend_indent.h"
 
 
-#if USE_SAPI
-#include "serverapi/sapi.h"
-void *gLock;
-#ifndef THREAD_SAFE
-struct sapi_request_info *sapi_rqst;
-#endif
-#endif
-
 #if MSVC5 || !defined(HAVE_GETOPT)
 #include "php_getopt.h"
 #endif

diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index e30375ef87053aa59962b5105e251c730a84a559..4ee4ed5d9ce03f36fa1b6e982b4780065b08ad46 100644 (file)
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -67,14 +67,6 @@
 #include "zend_highlight.h"
 #include "zend_indent.h"
 
-#if USE_SAPI
-#include "serverapi/sapi.h"
-void *gLock;
-#ifndef THREAD_SAFE
-struct sapi_request_info *sapi_rqst;
-#endif
-#endif
-
 #if WIN32|WINNT || !defined(HAVE_GETOPT)
 #include "php_getopt.h"
 #endif