com php-src: Fixed build.... (shouldn't it be zend_output_g lobals?): main/output.c main/php_output.h

From: Date: Thu, 30 Oct 2014 03:42:02 +0000
Subject: com php-src: Fixed build.... (shouldn't it be zend_output_g lobals?): main/output.c main/php_output.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82882@lists.php.net to get a copy of this message
Commit: 7b4993dd169a082c2fe79f975224057d1e16c779 Author: Xinchen Hui <laruence@php.net> Thu, 30 Oct 2014 11:42:02 +0800 Parents: fc904569ea5c5513925a69bf43820845eb3db104 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7b4993dd169a082c2fe79f975224057d1e16c779 Log: Fixed build.... (shouldn't it be zend_output_globals?) Changed paths: M main/output.c M main/php_output.h Diff: diff --git a/main/output.c b/main/output.c index c2b7b34..be5a222 100644 --- a/main/output.c +++ b/main/output.c @@ -38,7 +38,7 @@ #ifdef ZTS PHPAPI int output_globals_id; #else -PHPAPI php_output_globals output_globals; +PHPAPI zend_output_globals output_globals; #endif const char php_output_default_handler_name[sizeof("default output handler")] = "default output handler"; diff --git a/main/php_output.h b/main/php_output.h index 947da2c..edea0bf 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -155,7 +155,7 @@ ZEND_END_MODULE_GLOBALS(output) #ifdef ZTS PHPAPI extern int output_globals_id; #else -PHPAPI extern php_output_globals output_globals; +PHPAPI extern zend_output_globals output_globals; #endif /* there should not be a need to use OG() from outside of output.c */

« previous php.cvs (#82882) next »