- Make the output globals accessible from the outside world

- Fix Win32 compilation

3 files changed, 29 insertions, 20 deletions

diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c
index 921dc70775..3f45522a5c 100644
--- a/ext/standard/incomplete_class.c
+++ b/ext/standard/incomplete_class.c
@@ -70,6 +70,7 @@ static zval incomplete_class_get_property(zend_property_reference *property_refe
 	incomplete_class_message(property_reference);
 
 	/* does not reach this point */
+	memset(&foo, 0, sizeof(zval)); /* shut warnings up */
 	return (foo);
 }
 
diff --git a/ext/standard/output.c b/ext/standard/output.c
index 03d81165ff..c372b8efe7 100644
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -37,29 +37,9 @@ static void php_ob_prepend(const char *text, uint text_length);
 static inline void php_ob_send(void);
 
 
-typedef struct {
-	int (*php_body_write)(const char *str, uint str_length);		/* string output */
-	int (*php_header_write)(const char *str, uint str_length);	/* unbuffer string output */
-	char *ob_buffer;
-	uint ob_size;
-	uint ob_block_size;
-	uint ob_text_length;
-	unsigned char implicit_flush;
-	char *output_start_filename;
-	int output_start_lineno;
-} php_output_globals;
-
 #ifdef ZTS
-#define OLS_D php_output_globals *output_globals
-#define OLS_C output_globals
-#define OG(v) (output_globals->v)
-#define OLS_FETCH() php_output_globals *output_globals = ts_resource(output_globals_id)
 int output_globals_id;
 #else
-#define OLS_D void
-#define OLS_C
-#define OG(v) (output_globals.v)
-#define OLS_FETCH()
 php_output_globals output_globals;
 #endif
 
diff --git a/ext/standard/php_output.h b/ext/standard/php_output.h
index 957116ca41..1b747e7641 100644
--- a/ext/standard/php_output.h
+++ b/ext/standard/php_output.h
@@ -41,4 +41,32 @@ PHP_FUNCTION(ob_implicit_flush);
 
 PHP_GINIT_FUNCTION(output);
 
+typedef struct {
+	int (*php_body_write)(const char *str, uint str_length);		/* string output */
+	int (*php_header_write)(const char *str, uint str_length);	/* unbuffer string output */
+	char *ob_buffer;
+	uint ob_size;
+	uint ob_block_size;
+	uint ob_text_length;
+	unsigned char implicit_flush;
+	char *output_start_filename;
+	int output_start_lineno;
+} php_output_globals;
+
+
+#ifdef ZTS
+#define OLS_D php_output_globals *output_globals
+#define OLS_C output_globals
+#define OG(v) (output_globals->v)
+#define OLS_FETCH() php_output_globals *output_globals = ts_resource(output_globals_id)
+ZEND_API extern int output_globals_id;
+#else
+#define OLS_D void
+#define OLS_C
+#define OG(v) (output_globals.v)
+#define OLS_FETCH()
+ZEND_API extern php_output_globals output_globals;
+#endif
+
+
 #endif /* _OUTPUT_BUFFER */