Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed ZTS cache usage
This commit is contained in:
Dmitry Stogov 2019-03-12 15:14:00 +03:00
commit a29f7e93b4

View file

@ -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; \