diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 15:14:00 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-03-12 15:14:00 +0300 |
| commit | a29f7e93b4b2bf6d97c5965cf92a90e730b44007 (patch) | |
| tree | d82ad8602fa3c65235d26580f87c05343a72940f | |
| parent | 2b6cbcae06bbcee785e17fcec953123bd4dd38d7 (diff) | |
| parent | 25d4af9413b478393b9bc92fdb585495d56d8e25 (diff) | |
| download | php-git-a29f7e93b4b2bf6d97c5965cf92a90e730b44007.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed ZTS cache usage
| -rw-r--r-- | sapi/phpdbg/phpdbg_utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_utils.h b/sapi/phpdbg/phpdbg_utils.h index 84b1f5c511..c212056670 100644 --- a/sapi/phpdbg/phpdbg_utils.h +++ b/sapi/phpdbg/phpdbg_utils.h @@ -111,7 +111,7 @@ static zend_always_inline zend_execute_data *phpdbg_user_execute_data(zend_execu #define PHPDBG_OUTPUT_BACKUP_DEFINES() \ zend_output_globals *output_globals_ptr; \ zend_output_globals original_output_globals; \ - output_globals_ptr = TSRMG_BULK(output_globals_id, zend_output_globals *); + output_globals_ptr = TSRMG_BULK_STATIC(output_globals_id, zend_output_globals *); #else #define PHPDBG_OUTPUT_BACKUP_DEFINES() \ zend_output_globals *output_globals_ptr; \ |