diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-01-06 14:43:07 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-01-06 14:43:07 +0000 |
| commit | ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7 (patch) | |
| tree | 360c977fa1f03c2db397743988cd003e2321e44c /sapi/phpdbg/phpdbg.c | |
| parent | 55abb5d39501ca0fa9bc704198785b1f98c95bb2 (diff) | |
| parent | 7302b72d6e6bb77446599ec29a3b89702a506025 (diff) | |
| download | php-git-ae0ce19fa86377e5ab230ab9dca8f8dbd9826fd7.tar.gz | |
Merge branch 'master' into openssl_aead
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index d3ed746725..54e9a66f5f 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -52,6 +52,10 @@ # include "openssl/applink.c" #endif +#if defined(PHP_WIN32) && defined(ZTS) +ZEND_TSRMLS_CACHE_DEFINE(); +#endif + ZEND_DECLARE_MODULE_GLOBALS(phpdbg); int phpdbg_startup_run = 0; @@ -1312,10 +1316,6 @@ int main(int argc, char **argv) /* {{{ */ zend_bool is_exit; int exit_status; -#ifdef ZTS - void ***tsrm_ls; -#endif - #ifndef _WIN32 struct sigaction sigio_struct; struct sigaction signal_struct; @@ -1338,8 +1338,8 @@ int main(int argc, char **argv) /* {{{ */ #ifdef ZTS tsrm_startup(1, 1, 0, NULL); - - tsrm_ls = ts_resource(0); + (void)ts_resource(0); + ZEND_TSRMLS_CACHE_UPDATE(); #endif #ifdef ZEND_SIGNALS @@ -1520,7 +1520,7 @@ phpdbg_main: sapi_startup(phpdbg); phpdbg->startup(phpdbg); printf( - "phpdbg %s (built: %s %s)\nPHP %s, Copyright (c) 1997-2015 The PHP Group\n%s", + "phpdbg %s (built: %s %s)\nPHP %s, Copyright (c) 1997-2016 The PHP Group\n%s", PHPDBG_VERSION, __DATE__, __TIME__, @@ -1608,7 +1608,7 @@ phpdbg_main: if (settings > (zend_phpdbg_globals *) 0x2) { #ifdef ZTS - *((zend_phpdbg_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(phpdbg_globals_id)]) = *settings; + *((zend_phpdbg_globals *) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(phpdbg_globals_id)]) = *settings; #else phpdbg_globals = *settings; #endif |