summaryrefslogtreecommitdiff
path: root/Zend/zend_globals_macros.h
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2001-07-27 10:10:39 +0000
committerZeev Suraski <zeev@php.net>2001-07-27 10:10:39 +0000
commit2c254ba762d9392a732d5793b5b193ee6e395f1c (patch)
tree1b3d5bd700222f3bb7387b698be9647525d33573 /Zend/zend_globals_macros.h
parent736b4ae43d3f37fda450f6fcd67286a3bfed4fb6 (diff)
downloadphp-git-2c254ba762d9392a732d5793b5b193ee6e395f1c.tar.gz
Get rid of ELS_*(), and use TSRMLS_*() instead.
This patch is *bound* to break some files, as I must have had typos somewhere. If you use any uncommon extension, please try to build it...
Diffstat (limited to 'Zend/zend_globals_macros.h')
-rw-r--r--Zend/zend_globals_macros.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h
index eb783160eb..fbb4e71995 100644
--- a/Zend/zend_globals_macros.h
+++ b/Zend/zend_globals_macros.h
@@ -50,19 +50,9 @@ int zendparse(void);
/* Executor */
#ifdef ZTS
-# define ELS_D zend_executor_globals *executor_globals
-# define ELS_DC , ELS_D
-# define ELS_C executor_globals
-# define ELS_CC , ELS_C
-# define EG(v) (executor_globals->v)
-# define ELS_FETCH() zend_executor_globals *executor_globals = (zend_executor_globals *) ts_resource(executor_globals_id)
+# define EG(v) TSRMG(executor_globals_id, zend_executor_globals *, v)
#else
-# define ELS_D void
-# define ELS_DC
-# define ELS_C
-# define ELS_CC
# define EG(v) (executor_globals.v)
-# define ELS_FETCH()
extern ZEND_API zend_executor_globals executor_globals;
#endif