com php-src: Fixed ZTS cache usage: sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg_rinit_hook.h
| From: | Dmitry Stogov | Date: | Tue, 12 Mar 2019 12:05:56 +0000 |
| Subject: | com php-src: Fixed ZTS cache usage: sapi/phpdbg/phpdbg.h sapi/phpdbg/phpdbg_rinit_hook.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105104@lists.php.net to get a copy of this message | ||
Commit: b0d76ed4adce1099d6dd101e6757af6c1d0f6646
Author: Dmitry Stogov <dmitry@zend.com> Tue, 12 Mar 2019 15:05:56 +0300
Parents: f1b306fe117cfbbe69ab4ef9713d39ea068e74c0
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b0d76ed4adce1099d6dd101e6757af6c1d0f6646
Log:
Fixed ZTS cache usage
Changed paths:
M sapi/phpdbg/phpdbg.h
M sapi/phpdbg/phpdbg_rinit_hook..h
Diff:
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
index 7c00b04..06d2535 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 43e3b4c..a350dde 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