com php-src: force more static tsrmls cache usage: main/php_g lobals.h main/php_output.h

Commit: ebaa6a74a51d435c81489d7ea5df41e286135465 Author: Anatol Belski <ab@php.net> Tue, 7 Oct 2014 09:09:46 +0200 Parents: 38a076682fc69c44c5864fe7e7552e7838ff5a05 Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ebaa6a74a51d435c81489d7ea5df41e286135465 Log: force more static tsrmls cache usage Changed paths: M main/php_globals.h M main/php_output.h Diff: diff --git a/main/php_globals.h b/main/php_globals.h index a60efe6..76933d8 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 bcce872..69a4587 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