cvs: php-src /sapi/cgi cgi_main.c

stas Wed Aug 8 23:55:42 2007 UTC Modified files: /php-src/sapi/cgi cgi_main.c Log: remove unneeded variables http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.329&r2=1.330&diff_format=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.329 php-src/sapi/cgi/cgi_main.c:1.330 --- php-src/sapi/cgi/cgi_main.c:1.329 Wed Aug 8 13:02:01 2007 +++ php-src/sapi/cgi/cgi_main.c Wed Aug 8 23:55:42 2007 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.329 2007/08/08 13:02:01 dmitry Exp $ */ +/* $Id: cgi_main.c,v 1.330 2007/08/08 23:55:42 stas Exp $ */ #include "php.h" #include "php_globals.h" @@ -1117,10 +1117,6 @@ /* 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 @@ -1158,6 +1154,7 @@ #ifdef ZTS tsrm_startup(1, 1, 0, NULL); + tsrm_ls = ts_resource(0); #endif sapi_startup(&cgi_sapi_module); @@ -1240,11 +1237,6 @@ 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