cvs: php-src(PHP_4_4) /sapi/embed php_embed.c

stas Wed Aug 8 21:58:53 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/sapi/embed php_embed.c Log: remove unneded variables http://cvs.php.net/viewvc.cgi/php-src/sapi/embed/php_embed.c?r1=1.1.2.5.2.3&r2=1.1.2.5.2.4&diff_format=u Index: php-src/sapi/embed/php_embed.c diff -u php-src/sapi/embed/php_embed.c:1.1.2.5.2.3 php-src/sapi/embed/php_embed.c:1.1.2.5.2.4 --- php-src/sapi/embed/php_embed.c:1.1.2.5.2.3 Wed Aug 8 21:12:41 2007 +++ php-src/sapi/embed/php_embed.c Wed Aug 8 21:58:53 2007 @@ -15,7 +15,7 @@ | Author: Edin Kadribasic <edink@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_embed.c,v 1.1.2.5.2.3 2007/08/08 21:12:41 stas Exp $ */ +/* $Id: php_embed.c,v 1.1.2.5.2.4 2007/08/08 21:58:53 stas Exp $ */ #include "php_embed.h" @@ -137,7 +137,6 @@ { zend_llist global_vars; #ifdef ZTS - sapi_globals_struct *sapi_globals = NULL; void ***tsrm_ls = NULL; #endif @@ -161,6 +160,8 @@ #ifdef ZTS tsrm_startup(1, 1, 0, NULL); + tsrm_ls = ts_resource(0); + *ptsrm_ls = tsrm_ls; #endif sapi_startup(&php_embed_module); @@ -173,12 +174,6 @@ return FAILURE; } -#ifdef ZTS - sapi_globals = ts_resource(sapi_globals_id); - tsrm_ls = ts_resource(0); - *ptsrm_ls = tsrm_ls; -#endif - zend_llist_init(&global_vars, sizeof(char *), NULL, 0); /* Set some Embedded PHP defaults */