remove unneeded variables

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 6f1ea9c7cb2621d587f8ca88b1a2d23c12151dc6..ad0ab8d9acb511df271c7260a1ed6b9a941a757b 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1161,10 +1161,6 @@ int main(int argc, char *argv[])
 
 /* end of temporary locals */
 #ifdef ZTS
-       zend_compiler_globals *compiler_globals;
-       zend_executor_globals *executor_globals;
-       php_core_globals *core_globals;
-       sapi_globals_struct *sapi_globals;
        void ***tsrm_ls;
 #endif
 
@@ -1204,6 +1200,7 @@ int main(int argc, char *argv[])
 
 #ifdef ZTS
        tsrm_startup(1, 1, 0, NULL);
+       tsrm_ls = ts_resource(0);
 #endif
 
        sapi_startup(&cgi_sapi_module);
@@ -1295,11 +1292,6 @@ int main(int argc, char *argv[])
        php_optarg = orig_optarg;
 
 #ifdef ZTS
-       compiler_globals = ts_resource(compiler_globals_id);
-       executor_globals = ts_resource(executor_globals_id);
-       core_globals = ts_resource(core_globals_id);
-       sapi_globals = ts_resource(sapi_globals_id);
-       tsrm_ls = ts_resource(0);
        SG(request_info).path_translated = NULL;
 #endif
 

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 282aa932c7544b1cdefdfb8215da86f06f743e13..395888ccebb5b9e71ced80f3c11545adb25b6a16 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -607,10 +607,6 @@ int main(int argc, char *argv[])
        int hide_argv = 0;
 /* end of temporary locals */
 #ifdef ZTS
-       zend_compiler_globals *compiler_globals;
-       zend_executor_globals *executor_globals;
-       php_core_globals *core_globals;
-       sapi_globals_struct *sapi_globals;
        void ***tsrm_ls;
 #endif
 #ifdef PHP_CLI_WIN32_NO_CONSOLE
@@ -648,6 +644,7 @@ int main(int argc, char *argv[])
 
 #ifdef ZTS
        tsrm_startup(1, 1, 0, NULL);
+       tsrm_ls = ts_resource(0);
 #endif
 
        cli_sapi_module.ini_defaults = sapi_cli_ini_defaults;
@@ -716,14 +713,6 @@ int main(int argc, char *argv[])
 
        cli_sapi_module.executable_location = argv[0];
 
-#ifdef ZTS
-       compiler_globals = ts_resource(compiler_globals_id);
-       executor_globals = ts_resource(executor_globals_id);
-       core_globals = ts_resource(core_globals_id);
-       sapi_globals = ts_resource(sapi_globals_id);
-       tsrm_ls = ts_resource(0);
-#endif
-
        /* startup after we get the above ini override se we get things right */
        if (cli_sapi_module.startup(&cli_sapi_module)==FAILURE) {
                /* there is no way to see if we must call zend_ini_deactivate()