- Make the output globals accessible from the outside world

- Fix Win32 compilation

diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c
index 921dc70775ef9f919dcf097cb969ec0a546915a6..3f45522a5cd9586fbcdfffb0a33e513760c7909b 100644 (file)
--- 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 03d81165ffd40cb810d1b4f15d05cb67d4efe47a..c372b8efe73629cd5de1be0c22a220c88184d634 100644 (file)
--- 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 957116ca41dd9bdff82ae86c2e8eddc5727f797b..1b747e764182e4c23ed6660f0b4cd3e8ee6ce7c7 100644 (file)
--- 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 */

diff --git a/main/output.c b/main/output.c
index 03d81165ffd40cb810d1b4f15d05cb67d4efe47a..c372b8efe73629cd5de1be0c22a220c88184d634 100644 (file)
--- a/main/output.c
+++ b/main/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/main/php_output.h b/main/php_output.h
index 957116ca41dd9bdff82ae86c2e8eddc5727f797b..1b747e764182e4c23ed6660f0b4cd3e8ee6ce7c7 100644 (file)
--- a/main/php_output.h
+++ b/main/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 */

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 456bf86f8e701c27ba60c9adc3a979e14e7392ca..d5240cf3a0b165bc6d78f4f47ba7cb7e77d24826 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -389,6 +389,10 @@ SOURCE=..\ext\standard\image.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\standard\incomplete_class.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\standard\info.c\r
 # End Source File\r
 # Begin Source File\r
@@ -634,6 +638,10 @@ SOURCE=..\ext\odbc\php_odbc.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\ext\standard\php_output.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\ext\pcre\php_pcre.h\r
 # End Source File\r
 # Begin Source File\r