Fixed ZTS cache usage

diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
index 7c00b048c0dad21abd7d5ef17a3d7bc475468540..06d2535fb9b2817577c793f737662db637bb7a29 100644 (file)
--- 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 43e3b4ce6a611ef1d36f72cc904a40ba327bae78..a350ddec54afe5e8abaeea5c3b00819763f4a2cf 100644 (file)
--- 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