summaryrefslogtreecommitdiff
path: root/sapi/cli
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2007-08-08 23:51:57 +0000
committerStanislav Malyshev <stas@php.net>2007-08-08 23:51:57 +0000
commit50293835bf1884b4ee851075711b360150779c68 (patch)
treede6383a864afda74f1934d5d15cb4ff2beebb267 /sapi/cli
parent08286bcb9f937b1104ec0611d35bfdcbb18b0ba3 (diff)
downloadphp-git-50293835bf1884b4ee851075711b360150779c68.tar.gz
remove unneeded variables
Diffstat (limited to 'sapi/cli')
-rw-r--r--sapi/cli/php_cli.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 282aa932c7..395888cceb 100644
--- 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()