diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-06-11 15:15:31 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-06-11 15:15:31 +0200 |
| commit | 5fd027e35c17ac1f9f7845c47b55c8ea9c83f0fe (patch) | |
| tree | aa6574cf6419004bb7e9daa02f5dc66f9a377935 /TSRM | |
| parent | 2973cb2b1db35d7ea7313571cec0e827d71731f5 (diff) | |
| parent | 69190ce5c053a9bf97983932bd702137895b18df (diff) | |
| download | php-git-5fd027e35c17ac1f9f7845c47b55c8ea9c83f0fe.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
This reverts 0e5d4ea55554872fe72e5d984b73fc21abc561fe to fix the build on MacOSX
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index ed2dcc0d5a..1cd6177cca 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -139,14 +139,10 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void); TSRM_API uint8_t tsrm_is_main_thread(void); TSRM_API const char *tsrm_api_name(void); -#if defined(__cplusplus) && __cplusplus > 199711L -# define TSRM_TLS thread_local +#ifdef TSRM_WIN32 +# define TSRM_TLS __declspec(thread) #else -# ifdef TSRM_WIN32 -# define TSRM_TLS __declspec(thread) -# else -# define TSRM_TLS __thread -# endif +# define TSRM_TLS __thread #endif #define TSRM_SHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)+1) |