archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  Fixed ZTS cache usage
This commit is contained in:
Dmitry Stogov 2019-03-12 15:06:11 +03:00
commit 2b6cbcae06
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sapi/phpdbg/phpdbg.h
View file

@ -119,7 +119,7 @@
#if !defined(PHPDBG_WEBDATA_TRANSFER_H) && !defined(PHPDBG_WEBHELPER_H) #if !defined(PHPDBG_WEBDATA_TRANSFER_H) && !defined(PHPDBG_WEBHELPER_H)
#ifdef ZTS #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 #else
# define PHPDBG_G(v) (phpdbg_globals.v) # define PHPDBG_G(v) (phpdbg_globals.v)
#endif #endif

2
sapi/phpdbg/phpdbg_rinit_hook.h
View file

@ -27,7 +27,7 @@ extern zend_module_entry phpdbg_webhelper_module_entry;
#define phpext_phpdbg_webhelper_ptr &phpdbg_webhelper_module_entry #define phpext_phpdbg_webhelper_ptr &phpdbg_webhelper_module_entry
#ifdef ZTS #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 #else
# define PHPDBG_WG(v) (phpdbg_webhelper_globals.v) # define PHPDBG_WG(v) (phpdbg_webhelper_globals.v)
#endif #endif