com php-src: improve ZEND_TLS declaration even more a nd move it to the better place: Zend/zend_exe cute_API.c Zend/zend_portability.h Zend/zend_type
s.h
| From: | Anatol Belski | Date: | Tue, 28 Jul 2015 14:59:53 +0000 |
| Subject: | com php-src: improve ZEND_TLS declaration even more a nd move it to the better place: Zend/zend_exe cute_API.c Zend/zend_portability.h Zend/zend_type s.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88206@lists.php.net to get a copy of this message | ||
Commit: 5c98b9972f4426fa706fb205f8194c6afecc6a81
Author: Anatol Belski <ab@php.net> Tue, 28 Jul 2015 16:55:30 +0200
Parents: e6cbca77f562839ac57ee502be7c72cdf53080c6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5c98b9972f4426fa706fb205f8194c6afecc6a81
Log:
improve ZEND_TLS declaration even more and move it to the better place
Changed paths:
M Zend/zend_execute_API..c
M Zend/zend_portability.h
M Zend/zend_types.h
Diff:
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 41225b6..983bc5c 100644
--- 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 b04b55b..99069e5 100644
--- 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 c8fd149..52b7ddc 100644
--- 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;