summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-07-29 09:31:10 +0200
committerAnatol Belski <ab@php.net>2015-07-29 10:36:29 +0200
commit43cdfd9a82f99ddfc21c3b11bdebc565a4349634 (patch)
treedf19928c4b371640f329cdd47cfa8ba8ed18bbba
parent7104d88c357b03b8082b29bdf66b72e276defc43 (diff)
downloadphp-git-43cdfd9a82f99ddfc21c3b11bdebc565a4349634.tar.gz
add unified globals accessor macro
-rw-r--r--Zend/zend_API.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index df006e3396..ee3c8d96a7 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -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