archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  This reverts 0e5d4ea555 to fix the build on MacOSX
This commit is contained in:
Joe Watkins 2019-06-11 15:15:31 +02:00
commit 5fd027e35c
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TSRM/TSRM.h
View file

@ -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 uint8_t tsrm_is_main_thread(void);
TSRM_API const char *tsrm_api_name(void); TSRM_API const char *tsrm_api_name(void);
#if defined(__cplusplus) && __cplusplus > 199711L #ifdef TSRM_WIN32
# define TSRM_TLS thread_local # define TSRM_TLS __declspec(thread)
#else #else
# ifdef TSRM_WIN32 # define TSRM_TLS __thread
# define TSRM_TLS __declspec(thread)
# else
# define TSRM_TLS __thread
# endif
#endif #endif
#define TSRM_SHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)+1) #define TSRM_SHUFFLE_RSRC_ID(rsrc_id) ((rsrc_id)+1)