reworked the patch, less new stuff but worky

TLS is already used in TSRM, the way exporting the tsrm cache through
a thread local variable is not portable. Additionally, the current
patch suffers from bugs which are hard to find, but prevent it to
be worky with apache. What is done here is mainly uses the idea
from the RFC patch, but

- __thread variable is removed
- offset math and declarations are removed
- extra macros and definitions are removed

What is done merely is

- use an inline function to access the tsrm cache. The function uses
  the portable tsrm_tls_get macro which is cheap
- all the TSRM_* macros are set to placebo. Thus this opens the way
  remove them later

Except that, the logic is old. TSRMLS_FETCH will have to be done once
per thread, then tsrm_get_ls_cache() can be used. Things seeming to be
worky are cli, cli server and apache. I also tried to enable bz2
shared and it has worked out of the box. The change is yet minimal
diffing to the current master bus is a worky start, IMHO. Though will
have to recheck the other previously done SAPIs - embed and cgi.

The offsets can be added to the tsrm_resource_type struct, then
it'll not be needed to declare them in the userspace. Even the
"done" member type can be changed to int16 or smaller, then adding
the offset as int16 will not change the struct size. As well on the
todo might be removing the hashed storage, thread_id != thread_id and
linked list logic in favour of the explicit TLS operations.

3 files changed, 3 insertions, 4 deletions

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index f0689c2792..5806343518 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -221,8 +221,7 @@ if (PHP_DEBUG == "yes") {
 }
 
 if (PHP_ZTS == "yes") {
-	var tsrm_align = X64 ? 8 : 4;
-	ADD_FLAG("CFLAGS", "/D ZTS=1 /D USE___THREAD=1 /D TSRM_MM_ALIGNMENT=" + tsrm_align);
+	ADD_FLAG("CFLAGS", "/D ZTS=1");
 	ADD_FLAG("ZTS", "1");
 } else {
 	ADD_FLAG("ZTS", "0");
diff --git a/win32/globals.c b/win32/globals.c
index 47f4ebacce..ec4180db38 100644
--- a/win32/globals.c
+++ b/win32/globals.c
@@ -23,7 +23,7 @@
 #include "syslog.h"
 
 #ifdef ZTS
-TSRMG_D(php_win32_core_globals, php_win32_core_globals_id);
+PHPAPI int php_win32_core_globals_id;
 #else
 php_win32_core_globals the_php_win32_core_globals;
 #endif
diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h
index ae975dcb31..42f5ec9411 100644
--- a/win32/php_win32_globals.h
+++ b/win32/php_win32_globals.h
@@ -27,7 +27,7 @@ typedef struct _php_win32_core_globals php_win32_core_globals;
 
 #ifdef ZTS
 # define PW32G(v)		TSRMG(php_win32_core_globals_id, php_win32_core_globals*, v)
-TSRMG_DH(php_win32_core_globals, php_win32_core_globals_id);
+extern PHPAPI int php_win32_core_globals_id;
 #else
 # define PW32G(v)		(the_php_win32_core_globals.v)
 extern PHPAPI struct _php_win32_core_globals the_php_win32_core_globals;