com php-src: add unified globals accessor macro: Zend/zend_AP I.h
| From: | Anatol Belski | Date: | Wed, 29 Jul 2015 08:36:29 +0000 |
| Subject: | com php-src: add unified globals accessor macro: Zend/zend_AP I.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88217@lists.php.net to get a copy of this message | ||
Commit: 43cdfd9a82f99ddfc21c3b11bdebc565a4349634
Author: Anatol Belski <ab@php.net> Wed, 29 Jul 2015 09:31:10 +0200
Parents: 7104d88c357b03b8082b29bdf66b72e276defc43
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43cdfd9a82f99ddfc21c3b11bdebc565a4349634
Log:
add unified globals accessor macro
Changed paths:
M Zend/zend_API.h
Diff:
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index df006e3..ee3c8d9 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