From 0787cd60ed3d0c8c8c8ff7e49b9bb3587bf33b64 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 29 Jul 2015 10:35:57 +0200 Subject: first stone on using the unified globals accessor --- ext/spl/php_spl.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'ext/spl/php_spl.h') diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h index 015ada4ac2..bcee32ea8b 100644 --- a/ext/spl/php_spl.h +++ b/ext/spl/php_spl.h @@ -68,13 +68,8 @@ ZEND_BEGIN_MODULE_GLOBALS(spl) int autoload_running; ZEND_END_MODULE_GLOBALS(spl) -#ifdef ZTS -# define SPL_G(v) ZEND_TSRMG(spl_globals_id, zend_spl_globals *, v) -extern int spl_globals_id; -#else -# define SPL_G(v) (spl_globals.v) -extern zend_spl_globals spl_globals; -#endif +ZEND_EXTERN_MODULE_GLOBALS(spl); +#define SPL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(spl, v) PHP_FUNCTION(spl_classes); PHP_FUNCTION(class_parents); -- cgit v1.2.1