From b0d76ed4adce1099d6dd101e6757af6c1d0f6646 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 12 Mar 2019 15:05:56 +0300 Subject: [PATCH] Fixed ZTS cache usage --- sapi/phpdbg/phpdbg.h | 2 +- sapi/phpdbg/phpdbg_rinit_hook.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index 7c00b048c0d..06d2535fb9b 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -119,7 +119,7 @@ #if !defined(PHPDBG_WEBDATA_TRANSFER_H) && !defined(PHPDBG_WEBHELPER_H) #ifdef ZTS -# define PHPDBG_G(v) TSRMG(phpdbg_globals_id, zend_phpdbg_globals *, v) +# define PHPDBG_G(v) ZEND_TSRMG(phpdbg_globals_id, zend_phpdbg_globals *, v) #else # define PHPDBG_G(v) (phpdbg_globals.v) #endif diff --git a/sapi/phpdbg/phpdbg_rinit_hook.h b/sapi/phpdbg/phpdbg_rinit_hook.h index 43e3b4ce6a6..a350ddec54a 100644 --- a/sapi/phpdbg/phpdbg_rinit_hook.h +++ b/sapi/phpdbg/phpdbg_rinit_hook.h @@ -27,7 +27,7 @@ extern zend_module_entry phpdbg_webhelper_module_entry; #define phpext_phpdbg_webhelper_ptr &phpdbg_webhelper_module_entry #ifdef ZTS -# define PHPDBG_WG(v) TSRMG(phpdbg_webhelper_globals_id, zend_phpdbg_webhelper_globals *, v) +# define PHPDBG_WG(v) ZEND_TSRMG(phpdbg_webhelper_globals_id, zend_phpdbg_webhelper_globals *, v) #else # define PHPDBG_WG(v) (phpdbg_webhelper_globals.v) #endif