summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2014-10-30 11:42:02 +0800
committerXinchen Hui <laruence@php.net>2014-10-30 11:42:02 +0800
commit7b4993dd169a082c2fe79f975224057d1e16c779 (patch)
tree7e95f2b2e10a2ae69b166d63c995e63f3644829c
parentfc904569ea5c5513925a69bf43820845eb3db104 (diff)
downloadphp-git-7b4993dd169a082c2fe79f975224057d1e16c779.tar.gz
Fixed build.... (shouldn't it be zend_output_globals?)
-rw-r--r--main/output.c2
-rw-r--r--main/php_output.h2
2 files changed, 2 insertions, 2 deletions
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 */