summaryrefslogtreecommitdiff
path: root/main/php_globals.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-03-14 03:02:10 +0300
committerDmitry Stogov <dmitry@zend.com>2019-03-14 03:02:10 +0300
commit2dd2dcaf9c8bcdda9c687660da887c5fddeb7448 (patch)
tree0815453b216df50724b504f01825f3c4ca368f3e /main/php_globals.h
parentd349ea3ceb30b99657c0843f6ffc4ed7af619dd5 (diff)
parent9499484ed2f0377678b2b4d88573327ee0e4ce6d (diff)
downloadphp-git-2dd2dcaf9c8bcdda9c687660da887c5fddeb7448.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.
Diffstat (limited to 'main/php_globals.h')
-rw-r--r--main/php_globals.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/php_globals.h b/main/php_globals.h
index 004696cc04..a13c185450 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -24,8 +24,9 @@
typedef struct _php_core_globals php_core_globals;
#ifdef ZTS
-# define PG(v) ZEND_TSRMG(core_globals_id, php_core_globals *, v)
+# define PG(v) ZEND_TSRMG_FAST(core_globals_offset, php_core_globals *, v)
extern PHPAPI int core_globals_id;
+extern PHPAPI size_t core_globals_offset;
#else
# define PG(v) (core_globals.v)
extern ZEND_API struct _php_core_globals core_globals;