]> granicus.if.org Git - php/commitdiff
Fixed build.... (shouldn't it be zend_output_globals?)
authorXinchen Hui <laruence@php.net>
Thu, 30 Oct 2014 03:42:02 +0000 (11:42 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 30 Oct 2014 03:42:02 +0000 (11:42 +0800)
main/output.c
main/php_output.h

index c2b7b3422dc128a0d6603335f9356730ee1b7b6c..be5a2228535aaf37251a4f7a2c57d1c83562f374 100644 (file)
@@ -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";
index 947da2c915d03cd964ac23ad9a99213134aee018..edea0bff330b67ff6f9c5f0dfc36c58d4af15334 100644 (file)
@@ -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 */