]> granicus.if.org Git - php/commitdiff
add unified globals accessor macro
authorAnatol Belski <ab@php.net>
Wed, 29 Jul 2015 07:31:10 +0000 (09:31 +0200)
committerAnatol Belski <ab@php.net>
Wed, 29 Jul 2015 08:36:29 +0000 (10:36 +0200)
Zend/zend_API.h

index df006e3396c8b7a6f574e2f2be0d72c1ead300ad..ee3c8d96a7ad2c32d5acac28298c2e1956b29d18 100644 (file)
@@ -158,6 +158,7 @@ typedef struct _zend_fcall_info_cache {
        extern ts_rsrc_id module_name##_globals_id;
 #define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)      \
        ts_allocate_id(&module_name##_globals_id, sizeof(zend_##module_name##_globals), (ts_allocate_ctor) globals_ctor, (ts_allocate_dtor) globals_dtor);
+#define ZEND_MODULE_GLOBALS_ACCESSOR(module_name, v) ZEND_TSRMG(module_name##_globals_id, zend_##module_name##_globals *, v)
 
 #else
 
@@ -167,6 +168,7 @@ typedef struct _zend_fcall_info_cache {
        extern zend_##module_name##_globals module_name##_globals;
 #define ZEND_INIT_MODULE_GLOBALS(module_name, globals_ctor, globals_dtor)      \
        globals_ctor(&module_name##_globals);
+#define ZEND_MODULE_GLOBALS_ACCESSOR(module_name, v) (module_name##_globals.v)
 
 #endif