stas Wed Aug 8 21:57:30 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/embed php_embed.c
Log:
fix startup - remove unneeded variables
http://cvs.php.net/viewvc.cgi/php-src/sapi/embed/php_embed.c?r1=1.11.2.1.2.4&r2=1.11.2.1.2.5&diff_format=u
Index: php-src/sapi/embed/php_embed.c
diff -u php-src/sapi/embed/php_embed.c:1.11.2.1.2.4
php-src/sapi/embed/php_embed.c:1.11.2.1.2.5
--- php-src/sapi/embed/php_embed.c:1.11.2.1.2.4 Wed Aug 8 21:11:53 2007
+++ php-src/sapi/embed/php_embed.c Wed Aug 8 21:57:30 2007
@@ -15,7 +15,7 @@
| Author: Edin Kadribasic <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_embed.c,v 1.11.2.1.2.4 2007/08/08 21:11:53 stas Exp $ */
+/* $Id: php_embed.c,v 1.11.2.1.2.5 2007/08/08 21:57:30 stas Exp $ */
#include "php_embed.h"
@@ -143,7 +143,6 @@
{
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 @@
#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 @@
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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
