From b3aebda9eaf55706af2e21178f229a171725a168 Mon Sep 17 00:00:00 2001
From: krakjoe <joe.watkins@live.co.uk>
Date: Sat, 20 Sep 2014 20:22:14 +0100
Subject: native tls initial patch

---
 sapi/cli/php_cli.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'sapi/cli/php_cli.c')

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
-- 
cgit v1.2.1