Use TSRM macros

diff --git a/main/output.c b/main/output.c
index 49e2535333558ef01e4374cde371bd052ec3a6fc..4b2157943d6241e2d1bfab32b8e33ce3de4302b7 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -159,7 +159,7 @@ PHPAPI void php_output_shutdown(void)
 PHPAPI int php_output_activate(void)
 {
 #ifdef ZTS
-       memset((*((void ***) ZEND_TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(output_globals_id)], 0, sizeof(zend_output_globals));
+       memset(TSRMG_BULK_STATIC(output_globals_id, zend_output_globals*), 0, sizeof(zend_output_globals));
 #else
        memset(&output_globals, 0, sizeof(zend_output_globals));
 #endif

diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 3d8856c9f1ce92c41b39295b405d583ae06ac2aa..4834f8b5cf88aa5dd24ea1a07dd1d86cc9879a88 100644 (file)
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -1664,7 +1664,8 @@ phpdbg_main:
 
        if (settings > (zend_phpdbg_globals *) 0x2) {
 #ifdef ZTS
-               *((zend_phpdbg_globals *) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(phpdbg_globals_id)]) = *settings;
+               zend_phpdbg_globals *ptr = TSRMG_BULK_STATIC(phpdbg_globals_id, zend_phpdbg_globals *);
+               *ptr = *settings;
 #else
                phpdbg_globals = *settings;
 #endif

diff --git a/sapi/phpdbg/phpdbg_utils.h b/sapi/phpdbg/phpdbg_utils.h
index 90648c429e70974c3202e6668cb47eac68dad60f..84b1f5c51127a5fd0926acdf9132a46079f600d9 100644 (file)
--- 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 = (zend_output_globals *) (*((void ***) tsrm_get_ls_cache()))[TSRM_UNSHUFFLE_RSRC_ID(output_globals_id)];
+       output_globals_ptr = TSRMG_BULK(output_globals_id, zend_output_globals *);
 #else
 #define PHPDBG_OUTPUT_BACKUP_DEFINES() \
        zend_output_globals *output_globals_ptr; \