Use macro

diff --git a/main/output.c b/main/output.c
index be5a2228535aaf37251a4f7a2c57d1c83562f374..1dac7179b8eab2de35e145aaf2c4417478668fc8 100644 (file)
--- 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 edea0bff330b67ff6f9c5f0dfc36c58d4af15334..6c4b1f7a42956b9bf7e3c0566b4023c0a9f7a364 100644 (file)
--- 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