Skip to content

Commit af3ca74

Browse files
weltlingweltling
committed
made ZEND_TSRMLS_CACHE_* macros look like function calls
which also comply with the current semantics for such macros
1 parent 812c0c0 commit af3ca74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+109
-109
lines changed

‎TSRM/TSRM.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ TSRM_API void *tsrm_get_ls_cache(void);
168168
#define TSRMG(id, type, element) (((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
169169

170170
#define TSRMG_STATIC(id, type, element) (((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element)
171-
#define TSRMLS_CACHE_EXTERN extern TSRM_TLS void *TSRMLS_CACHE
172-
#define TSRMLS_CACHE_DEFINE TSRM_TLS void *TSRMLS_CACHE = NULL
173-
#define TSRMLS_CACHE_UPDATE if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
171+
#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
172+
#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
173+
#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache()
174174
#define TSRMLS_CACHE _tsrm_ls_cache
175175

176176
/* BC only */
@@ -191,9 +191,9 @@ TSRM_API void *tsrm_get_ls_cache(void);
191191
#define TSRMLS_SET_CTX(ctx)
192192

193193
#define TSRMG_STATIC(id, type, element)
194-
#define TSRMLS_CACHE_EXTERN
195-
#define TSRMLS_CACHE_DEFINE
196-
#define TSRMLS_CACHE_UPDATE
194+
#define TSRMLS_CACHE_EXTERN()
195+
#define TSRMLS_CACHE_DEFINE()
196+
#define TSRMLS_CACHE_UPDATE()
197197
#define TSRMLS_CACHE
198198

199199
/* BC only */

‎TSRM/tsrm_win32.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static tsrm_win32_globals win32_globals;
4343
static void tsrm_win32_ctor(tsrm_win32_globals *globals)
4444
{
4545
#ifdef ZTS
46-
TSRMLS_CACHE_UPDATE;
46+
TSRMLS_CACHE_UPDATE();
4747
#endif
4848
globals->process = NULL;
4949
globals->shm = NULL;

‎TSRM/tsrm_win32.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ typedef struct {
7272

7373
#ifdef ZTS
7474
# define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
75-
TSRMLS_CACHE_EXTERN;
75+
TSRMLS_CACHE_EXTERN();
7676
#else
7777
# define TWG(v) (win32_globals.v)
7878
#endif

‎Zend/zend.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static HashTable *global_class_table = NULL;
120120
static HashTable *global_constants_table = NULL;
121121
static HashTable *global_auto_globals_table = NULL;
122122
static HashTable *global_persistent_list = NULL;
123-
ZEND_TSRMLS_CACHE_DEFINE;
123+
ZEND_TSRMLS_CACHE_DEFINE();
124124
#endif
125125

126126
ZEND_API zend_utility_values zend_uv;
@@ -465,7 +465,7 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals) /* {{
465465

466466
static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{{ */
467467
{
468-
ZEND_TSRMLS_CACHE_UPDATE;
468+
ZEND_TSRMLS_CACHE_UPDATE();
469469
zend_startup_constants();
470470
zend_copy_constants(EG(zend_constants), GLOBAL_CONSTANTS_TABLE);
471471
zend_init_rsrc_plist();
@@ -564,7 +564,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) /
564564
zend_executor_globals *executor_globals;
565565
extern ZEND_API ts_rsrc_id ini_scanner_globals_id;
566566
extern ZEND_API ts_rsrc_id language_scanner_globals_id;
567-
ZEND_TSRMLS_CACHE_UPDATE;
567+
ZEND_TSRMLS_CACHE_UPDATE();
568568
#else
569569
extern zend_ini_scanner_globals ini_scanner_globals;
570570
extern zend_php_scanner_globals language_scanner_globals;

‎Zend/zend.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@
6262

6363
#ifdef ZEND_ENABLE_STATIC_TSRMLS_CACHE
6464
#define ZEND_TSRMG TSRMG_STATIC
65-
#define ZEND_TSRMLS_CACHE_EXTERN TSRMLS_CACHE_EXTERN
66-
#define ZEND_TSRMLS_CACHE_DEFINE TSRMLS_CACHE_DEFINE
67-
#define ZEND_TSRMLS_CACHE_UPDATE TSRMLS_CACHE_UPDATE
65+
#define ZEND_TSRMLS_CACHE_EXTERN() TSRMLS_CACHE_EXTERN()
66+
#define ZEND_TSRMLS_CACHE_DEFINE() TSRMLS_CACHE_DEFINE()
67+
#define ZEND_TSRMLS_CACHE_UPDATE() TSRMLS_CACHE_UPDATE()
6868
#define ZEND_TSRMLS_CACHE TSRMLS_CACHE
6969
#else
7070
#define ZEND_TSRMG TSRMG
71-
#define ZEND_TSRMLS_CACHE_EXTERN
72-
#define ZEND_TSRMLS_CACHE_DEFINE
73-
#define ZEND_TSRMLS_CACHE_UPDATE
71+
#define ZEND_TSRMLS_CACHE_EXTERN()
72+
#define ZEND_TSRMLS_CACHE_DEFINE()
73+
#define ZEND_TSRMLS_CACHE_UPDATE()
7474
#define ZEND_TSRMLS_CACHE
7575
#endif
7676

77-
ZEND_TSRMLS_CACHE_EXTERN;
77+
ZEND_TSRMLS_CACHE_EXTERN();
7878

7979
#ifdef HAVE_NORETURN
8080
# ifdef ZEND_NORETRUN_ALIAS

‎Zend/zend_alloc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2388,7 +2388,7 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
23882388
return;
23892389
}
23902390
#endif
2391-
ZEND_TSRMLS_CACHE_UPDATE;
2391+
ZEND_TSRMLS_CACHE_UPDATE();
23922392
alloc_globals->mm_heap = zend_mm_init();
23932393
}
23942394

‎ext/bcmath/bcmath.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ zend_module_entry bcmath_module_entry = {
128128

129129
#ifdef COMPILE_DL_BCMATH
130130
#ifdef ZTS
131-
ZEND_TSRMLS_CACHE_DEFINE;
131+
ZEND_TSRMLS_CACHE_DEFINE();
132132
#endif
133133
ZEND_GET_MODULE(bcmath)
134134
#endif
@@ -144,7 +144,7 @@ PHP_INI_END()
144144
static PHP_GINIT_FUNCTION(bcmath)
145145
{
146146
#if defined(COMPILE_DL_BCMATH) && defined(ZTS)
147-
ZEND_TSRMLS_CACHE_UPDATE;
147+
ZEND_TSRMLS_CACHE_UPDATE();
148148
#endif
149149
bcmath_globals->bc_precision = 0;
150150
bc_init_numbers();

‎ext/bcmath/php_bcmath.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ZEND_END_MODULE_GLOBALS(bcmath)
5151
#ifdef ZTS
5252
# define BCG(v) ZEND_TSRMG(bcmath_globals_id, zend_bcmath_globals *, v)
5353
# ifdef COMPILE_DL_BCMATH
54-
ZEND_TSRMLS_CACHE_EXTERN;
54+
ZEND_TSRMLS_CACHE_EXTERN();
5555
# endif
5656
#else
5757
# define BCG(v) (bcmath_globals.v)

‎ext/com_dotnet/com_extension.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ zend_module_entry com_dotnet_module_entry = {
255255

256256
#ifdef COMPILE_DL_COM_DOTNET
257257
#ifdef ZTS
258-
ZEND_TSRMLS_CACHE_DEFINE;
258+
ZEND_TSRMLS_CACHE_DEFINE();
259259
#endif
260260
ZEND_GET_MODULE(com_dotnet)
261261
#endif
@@ -341,7 +341,7 @@ PHP_INI_END()
341341
static PHP_GINIT_FUNCTION(com_dotnet)
342342
{
343343
#if defined(COMPILE_DL_COM_DOTNET) && defined(ZTS)
344-
ZEND_TSRMLS_CACHE_UPDATE;
344+
ZEND_TSRMLS_CACHE_UPDATE();
345345
#endif
346346
memset(com_dotnet_globals, 0, sizeof(*com_dotnet_globals));
347347
com_dotnet_globals->code_page = CP_ACP;

‎ext/com_dotnet/php_com_dotnet.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ZEND_END_MODULE_GLOBALS(com_dotnet)
5555
#ifdef ZTS
5656
# define COMG(v) ZEND_TSRMG(com_dotnet_globals_id, zend_com_dotnet_globals *, v)
5757
# ifdef COMPILE_DL_COM_DOTNET
58-
ZEND_TSRMLS_CACHE_EXTERN;
58+
ZEND_TSRMLS_CACHE_EXTERN();
5959
# endif
6060
#else
6161
# define COMG(v) (com_dotnet_globals.v)

0 commit comments

Comments
 (0)