diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-09-20 20:22:14 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-09-20 20:22:14 +0100 |
| commit | b3aebda9eaf55706af2e21178f229a171725a168 (patch) | |
| tree | 9aa1794dc4b513d5c0077adcbeb89fa215f181a4 /sapi/cli/php_cli.c | |
| parent | 763bfb4f3b0e66d5a961f9f367aa86e9f9da262e (diff) | |
| download | php-git-b3aebda9eaf55706af2e21178f229a171725a168.tar.gz | |
native tls initial patch
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 04cbdeb8f1..8c9792162b 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1177,9 +1177,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; @@ -1235,7 +1232,7 @@ int main(int argc, char *argv[]) #ifdef ZTS tsrm_startup(1, 1, 0, NULL); - tsrm_ls = ts_resource(0); + TSRMLS_INIT(); #endif #ifdef PHP_WIN32 |