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

vars with __declspec(thread) cannot use __declspec(dllexport)

Browse source
This commit is contained in:
Anatol Belski 2014-09-20 22:13:10 +02:00
parent aa339d00d8
commit 2720743636
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TSRM/TSRM.c
View file

@ -63,8 +63,12 @@ static int tsrm_error_level;
static FILE *tsrm_error_file;
#ifdef USE___THREAD
#ifdef TSRM_WIN32
TSRM_TLS void *tsrm_ls_cache = 0;
#else
TSRM_API TSRM_TLS void *tsrm_ls_cache = 0;
#endif
#endif
#ifdef PASS_TSRMLS
# define CALL_TSRMG_CTOR(ctor, globale, storage) (ctor)((globale), (storage))

4
TSRM/TSRM.h
View file

@ -109,7 +109,11 @@ extern "C" {
# define TSRM_TLS __thread
# endif
#ifdef TSRM_WIN32
extern TSRM_TLS void *tsrm_ls_cache;
#else
TSRM_API extern TSRM_TLS void *tsrm_ls_cache;
#endif
#define TSRMG(id, type, element) \
((type)((tsrm_uintptr_t)tsrm_ls_cache + id##_offset))->element