com php-src: Use macro: main/output.c main/php_output.h

From: Date: Thu, 30 Oct 2014 03:52:29 +0000
Subject: com php-src: Use macro: main/output.c main/php_output.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82885@lists.php.net to get a copy of this message
Commit: 9e1da42af18265d007b5246f01895d3cafc78939 Author: Xinchen Hui <laruence@php.net> Thu, 30 Oct 2014 11:52:29 +0800 Parents: 7b4993dd169a082c2fe79f975224057d1e16c779 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9e1da42af18265d007b5246f01895d3cafc78939 Log: Use macro Changed paths: M main/output.c M main/php_output.h Diff: diff --git a/main/output.c b/main/output.c index be5a222..1dac717 100644 --- a/main/output.c +++ b/main/output.c @@ -35,11 +35,7 @@ #include "zend_stack.h" #include "php_output.h" -#ifdef ZTS -PHPAPI int output_globals_id; -#else -PHPAPI zend_output_globals output_globals; -#endif +ZEND_DECLARE_MODULE_GLOBALS(output); const char php_output_default_handler_name[sizeof("default output handler")] = "default output handler"; const char php_output_devnull_handler_name[sizeof("null output handler")] = "null output handler"; diff --git a/main/php_output.h b/main/php_output.h index edea0bf..6c4b1f7 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -152,11 +152,7 @@ ZEND_BEGIN_MODULE_GLOBALS(output) int output_start_lineno; ZEND_END_MODULE_GLOBALS(output) -#ifdef ZTS -PHPAPI extern int output_globals_id; -#else -PHPAPI extern zend_output_globals output_globals; -#endif +ZEND_EXTERN_MODULE_GLOBALS(output); /* there should not be a need to use OG() from outside of output.c */ #ifdef ZTS

« previous php.cvs (#82885) next »