com php-src: make the TSRM macros depend no the macroed cache name: TSRM/TSRM.h

From: Date: Tue, 16 Dec 2014 09:44:43 +0000
Subject: com php-src: make the TSRM macros depend no the macroed cache name: TSRM/TSRM.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83740@lists.php.net to get a copy of this message
Commit: 24f0d2ed54dbc4d059978d45a8157adaa812ca0c Author: Anatol Belski <ab@php.net> Tue, 16 Dec 2014 10:44:43 +0100 Parents: a85eb75cba76845c645732e3ba230b83b019a914 Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=24f0d2ed54dbc4d059978d45a8157adaa812ca0c Log: make the TSRM macros depend no the macroed cache name Changed paths: M TSRM/TSRM.h Diff: diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 0624bd1..d3891b7 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -170,10 +170,10 @@ TSRM_API inline void *tsrm_get_ls_cache(void); #define TSRMLS_SET_CTX(ctx) ctx = (void ***) tsrm_get_ls_cache() #define TSRMG(id, type, element) (((type) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element) -#define TSRMG_STATIC(id, type, element) (((type) (*((void ***) _tsrm_ls_cache))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element) -#define TSRMLS_CACHE_EXTERN extern TSRM_TLS void *_tsrm_ls_cache -#define TSRMLS_CACHE_DEFINE TSRM_TLS void *_tsrm_ls_cache = NULL -#define TSRMLS_CACHE_UPDATE if (!TSRMLS_CACHE) _tsrm_ls_cache = tsrm_get_ls_cache() +#define TSRMG_STATIC(id, type, element) (((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])->element) +#define TSRMLS_CACHE_EXTERN extern TSRM_TLS void *TSRMLS_CACHE +#define TSRMLS_CACHE_DEFINE TSRM_TLS void *TSRMLS_CACHE = NULL +#define TSRMLS_CACHE_UPDATE if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache() #define TSRMLS_CACHE _tsrm_ls_cache /* BC only */

« previous php.cvs (#83740) next »