export output globals

needed by phpdbg

diff --git a/main/output.c b/main/output.c
index 1dac7179b8eab2de35e145aaf2c4417478668fc8..c2b7b3422dc128a0d6603335f9356730ee1b7b6c 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -35,7 +35,11 @@
 #include "zend_stack.h"
 #include "php_output.h"
 
-ZEND_DECLARE_MODULE_GLOBALS(output);
+#ifdef ZTS
+PHPAPI int output_globals_id;
+#else
+PHPAPI php_output_globals output_globals;
+#endif
 
 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 0312e256f80048701605704fb7d98b83e16f92c6..947da2c915d03cd964ac23ad9a99213134aee018 100644 (file)
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -152,6 +152,12 @@ 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 php_output_globals output_globals;
+#endif
+
 /* there should not be a need to use OG() from outside of output.c */
 #ifdef ZTS
 # define OG(v) TSRMG(output_globals_id, zend_output_globals *, v)