diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-03 16:46:04 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-03 16:50:01 +0100 |
| commit | 1ac152938cfe40e98b7b3c8cf403abb113266cfa (patch) | |
| tree | dd2f32f9075d3ca31946c5b9d10a464a07776c3a /TSRM | |
| parent | c4b188871e7abb7c6cc20d05ceda4cea082efcd2 (diff) | |
| download | php-git-1ac152938cfe40e98b7b3c8cf403abb113266cfa.tar.gz | |
Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
Also re bug #71575.
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.h | 4 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 248d3fbdee..f9bb241050 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -170,8 +170,8 @@ TSRM_API void *tsrm_get_ls_cache(void); #define TSRMG_STATIC(id, type, element) (TSRMG_BULK_STATIC(id, type)->element) #define TSRMG_BULK_STATIC(id, type) ((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)]) -#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE -#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL +#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE; +#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL; #if ZEND_DEBUG #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache() #else diff --git a/TSRM/tsrm_win32.h b/TSRM/tsrm_win32.h index bddf4c1d2e..fbeac07b01 100644 --- a/TSRM/tsrm_win32.h +++ b/TSRM/tsrm_win32.h @@ -72,7 +72,7 @@ typedef struct { #ifdef ZTS # define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v) -TSRMLS_CACHE_EXTERN(); +TSRMLS_CACHE_EXTERN() #else # define TWG(v) (win32_globals.v) #endif |