diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-04 16:14:14 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-04 16:14:14 +0200 |
| commit | a4633b13d4dc33c067159192a0e0f146e03f8738 (patch) | |
| tree | e59dcfbcf566e39a3492571a6d98313b8a26a3cc /TSRM | |
| parent | 9a495911c86f0304bd4a18dd32e8765696087099 (diff) | |
| parent | 2d3bc71e89e270e90ba0886eef37ea106f010ca0 (diff) | |
| download | php-git-a4633b13d4dc33c067159192a0e0f146e03f8738.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/TSRM.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 0fa2ccb48b..ad18012f3d 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -167,13 +167,7 @@ TSRM_API const char *tsrm_api_name(void); #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; -#if ZEND_DEBUG #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache() -#define TSRMLS_CACHE_RESET() -#else -#define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache() -#define TSRMLS_CACHE_RESET() TSRMLS_CACHE = NULL -#endif #define TSRMLS_CACHE _tsrm_ls_cache /* BC only */ |