diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-13 18:27:10 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-13 18:27:10 +0800 |
| commit | 627a2137617712696137a3b1791b5eeb25a56302 (patch) | |
| tree | 1b87f7901c06206515320ea48aa119293bbc9457 /sapi/cli/php_cli.c | |
| parent | e5d8a14239b03c065b1a9df3ad35ef532063f701 (diff) | |
| parent | 5d8ebcc73c4f873a6a38189ce5bd99ccf863c665 (diff) | |
| download | php-git-627a2137617712696137a3b1791b5eeb25a56302.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
Diffstat (limited to 'sapi/cli/php_cli.c')
| -rw-r--r-- | sapi/cli/php_cli.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 8a8e113db0..81eba9a83a 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1178,9 +1178,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine int main(int argc, char *argv[]) #endif { -#ifdef ZTS - void ***tsrm_ls; -#endif #ifdef PHP_CLI_WIN32_NO_CONSOLE int argc = __argc; char **argv = __argv; @@ -1236,7 +1233,7 @@ 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 |