Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed ZTS cache usage

Author: dstogov

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

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