diff options
| author | Stanislav Malyshev <stas@php.net> | 2007-08-08 21:57:30 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2007-08-08 21:57:30 +0000 |
| commit | 45e907a0eeae9524bc9a3acd0d5c64f405241c1d (patch) | |
| tree | 21dd71fad890dbe9d01fd06c46be8b43d7ae0cca /sapi/embed/php_embed.c | |
| parent | 1e7a23a376e449247d307b17f81ec3a5559388bb (diff) | |
| download | php-git-45e907a0eeae9524bc9a3acd0d5c64f405241c1d.tar.gz | |
fix startup - remove unneeded variables
Diffstat (limited to 'sapi/embed/php_embed.c')
| -rw-r--r-- | sapi/embed/php_embed.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index fcf0b158d5..0d68847b8d 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -143,7 +143,6 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC) { zend_llist global_vars; #ifdef ZTS - sapi_globals_struct *sapi_globals = NULL; void ***tsrm_ls = NULL; #endif int ini_entries_len = 0; @@ -168,6 +167,8 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC) #ifdef ZTS tsrm_startup(1, 1, 0, NULL); + tsrm_ls = ts_resource(0); + *ptsrm_ls = tsrm_ls; #endif ini_entries_len = strlen(HARDCODED_INI); @@ -185,12 +186,6 @@ int php_embed_init(int argc, char **argv PTSRMLS_DC) 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 */ |