improve ZEND_TLS declaration even more and move it to the better place

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 41225b6dc26ad80d22b59aadb89b9aab2771f28b..983bc5c1e34109d78646cd877dde8f19680a8107 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -46,7 +46,7 @@ ZEND_API const zend_fcall_info empty_fcall_info = { 0, NULL, {{0}, {{0}}, {0}},
 ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL, NULL };
 
 #ifdef ZEND_WIN32
-static ZEND_TLS HANDLE tq_timer = NULL;
+ZEND_TLS HANDLE tq_timer = NULL;
 #endif
 
 #if 0&&ZEND_DEBUG

diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index b04b55bbb18776e1474b8ea922d0233dc8e5063c..99069e57e1228aec3de9afd63ee0f8bbc1a1d23a 100644 (file)
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -443,12 +443,6 @@ char *alloca();
 #define ZEND_VALID_SOCKET(sock) ((sock) >= 0)
 #endif
 
-#ifdef ZTS
-#define ZEND_TLS TSRM_TLS
-#else
-#define ZEND_TLS
-#endif
-
 #endif /* ZEND_PORTABILITY_H */
 
 /*

diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index c8fd149320826a6ce2b35fd753770e24dd944503..52b7ddcb4c3a334963616cd77342311bbf97efd6 100644 (file)
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -67,6 +67,12 @@ typedef enum {
 typedef intptr_t zend_intptr_t;
 typedef uintptr_t zend_uintptr_t;
 
+#ifdef ZTS
+#define ZEND_TLS static TSRM_TLS
+#else
+#define ZEND_TLS static
+#endif
+
 typedef struct _zend_object_handlers zend_object_handlers;
 typedef struct _zend_class_entry     zend_class_entry;
 typedef union  _zend_function        zend_function;