From ebaa6a74a51d435c81489d7ea5df41e286135465 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 7 Oct 2014 09:09:46 +0200 Subject: [PATCH] force more static tsrmls cache usage --- main/php_globals.h | 2 +- main/php_output.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/php_globals.h b/main/php_globals.h index a60efe69de9..76933d8f078 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -26,7 +26,7 @@ typedef struct _php_core_globals php_core_globals; #ifdef ZTS -# define PG(v) TSRMG(core_globals_id, php_core_globals *, v) +# define PG(v) ZEND_TSRMG(core_globals_id, php_core_globals *, v) extern PHPAPI int core_globals_id; #else # define PG(v) (core_globals.v) diff --git a/main/php_output.h b/main/php_output.h index bcce8720e12..69a45878cdd 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -148,7 +148,7 @@ ZEND_END_MODULE_GLOBALS(output) /* there should not be a need to use OG() from outside of output.c */ #ifdef ZTS -# define OG(v) TSRMG(output_globals_id, zend_output_globals *, v) +# define OG(v) ZEND_TSRMG(output_globals_id, zend_output_globals *, v) #else # define OG(v) (output_globals.v) #endif