cvs: php4 /ext/standard incomplete_class.c output.c php_output.h /win32 php4dllts.dsp

zeev Sat Jun 24 06:27:34 2000 EDT Modified files: /php4/ext/standard incomplete_class.c output.c php_output.h /php4/win32 php4dllts.dsp Log: - Make the output globals accessible from the outside world - Fix Win32 compilation Index: php4/ext/standard/incomplete_class.c diff -u php4/ext/standard/incomplete_class.c:1.2 php4/ext/standard/incomplete_class.c:1.3 --- php4/ext/standard/incomplete_class.c:1.2 Fri Jun 23 09:58:30 2000 +++ php4/ext/standard/incomplete_class.c Sat Jun 24 06:27:34 2000 @@ -17,7 +17,7 @@ */ -/* $Id: incomplete_class.c,v 1.2 2000/06/23 16:58:30 sas Exp $ */ +/* $Id: incomplete_class.c,v 1.3 2000/06/24 13:27:34 zeev Exp $ */ #include "php.h" #include "basic_functions.h" @@ -70,6 +70,7 @@ incomplete_class_message(property_reference); /* does not reach this point */ + memset(&foo, 0, sizeof(zval)); /* shut warnings up */ return (foo); } Index: php4/ext/standard/output.c diff -u php4/ext/standard/output.c:1.23 php4/ext/standard/output.c:1.24 --- php4/ext/standard/output.c:1.23 Tue Jun 6 11:54:00 2000 +++ php4/ext/standard/output.c Sat Jun 24 06:27:34 2000 @@ -37,29 +37,9 @@ 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 Index: php4/ext/standard/php_output.h diff -u php4/ext/standard/php_output.h:1.9 php4/ext/standard/php_output.h:1.10 --- php4/ext/standard/php_output.h:1.9 Thu May 18 08:34:35 2000 +++ php4/ext/standard/php_output.h Sat Jun 24 06:27:34 2000 @@ -41,4 +41,32 @@ 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 */ Index: php4/win32/php4dllts.dsp diff -u php4/win32/php4dllts.dsp:1.2 php4/win32/php4dllts.dsp:1.3 --- php4/win32/php4dllts.dsp:1.2 Thu Jun 22 14:24:44 2000 +++ php4/win32/php4dllts.dsp Sat Jun 24 06:27:34 2000 @@ -389,6 +389,10 @@ # End Source File # Begin Source File +SOURCE=..\ext\standard\incomplete_class.c +# End Source File +# Begin Source File + SOURCE=..\ext\standard\info.c # End Source File # Begin Source File @@ -631,6 +635,10 @@ # Begin Source File SOURCE=..\ext\odbc\php_odbc.h +# End Source File +# Begin Source File + +SOURCE=..\ext\standard\php_output.h # End Source File # Begin Source File