From: Xinchen Hui <laruence@php.net>
Date: Thu, 30 Oct 2014 03:42:02 +0000 (+0800)
Subject: Fixed build.... (shouldn't it be zend_output_globals?)
X-Git-Tag: php-5.6.3RC1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b4993dd169a082c2fe79f975224057d1e16c779;p=php

Fixed build.... (shouldn't it be zend_output_globals?)
---

diff --git a/main/output.c b/main/output.c
index c2b7b3422d..be5a222853 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 947da2c915..edea0bff33 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 */