cvs: php-src(PHP_4_4) / NEWS /main output.c php_output.h

tony2001 Mon Feb 12 17:13:23 2007 UTC Modified files: (Branch: PHP_4_4) /php-src NEWS /php-src/main output.c php_output.h Log: fix #40335 (Compile fails when using GCC 4.1.1/binutils 2.17) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.189&r2=1.1247.2.920.2.190&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.189 php-src/NEWS:1.1247.2.920.2.190 --- php-src/NEWS:1.1247.2.920.2.189 Thu Feb 1 08:55:40 2007 +++ php-src/NEWS Mon Feb 12 17:13:22 2007 @@ -1,6 +1,7 @@ PHP 4 NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Feb 2007, Version 4.4.5 +- Fixed bug #40335 (Compile fails when using GCC 4.1.1/binutils 2.17). (Tony) 01 Feb 2007, Version 4.4.5RC2 - Fixed bug #39819 (Using $this not in object context can cause segfaults). http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.142.2.16.2.5&r2=1.142.2.16.2.6&diff_format=u Index: php-src/main/output.c diff -u php-src/main/output.c:1.142.2.16.2.5 php-src/main/output.c:1.142.2.16.2.6 --- php-src/main/output.c:1.142.2.16.2.5 Mon Jan 1 09:46:50 2007 +++ php-src/main/output.c Mon Feb 12 17:13:22 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.142.2.16.2.5 2007/01/01 09:46:50 sebastian Exp $ */ +/* $Id: output.c,v 1.142.2.16.2.6 2007/02/12 17:13:22 tony2001 Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -49,7 +49,7 @@ #endif /* {{{ php_default_output_func */ -static inline int php_default_output_func(const char *str, uint str_len TSRMLS_DC) +PHPAPI int php_default_output_func(const char *str, uint str_len TSRMLS_DC) { fwrite(str, 1, str_len, stderr); return str_len; http://cvs.php.net/viewvc.cgi/php-src/main/php_output.h?r1=1.47.2.1.8.2&r2=1.47.2.1.8.3&diff_format=u Index: php-src/main/php_output.h diff -u php-src/main/php_output.h:1.47.2.1.8.2 php-src/main/php_output.h:1.47.2.1.8.3 --- php-src/main/php_output.h:1.47.2.1.8.2 Mon Jan 1 09:46:50 2007 +++ php-src/main/php_output.h Mon Feb 12 17:13:22 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_output.h,v 1.47.2.1.8.2 2007/01/01 09:46:50 sebastian Exp $ */ +/* $Id: php_output.h,v 1.47.2.1.8.3 2007/02/12 17:13:22 tony2001 Exp $ */ #ifndef PHP_OUTPUT_H #define PHP_OUTPUT_H @@ -27,6 +27,7 @@ PHPAPI void php_output_activate(TSRMLS_D); PHPAPI void php_output_set_status(zend_bool status TSRMLS_DC); PHPAPI void php_output_register_constants(TSRMLS_D); +PHPAPI int php_default_output_func(const char *str, uint str_len TSRMLS_DC); PHPAPI int php_body_write(const char *str, uint str_length TSRMLS_DC); PHPAPI int php_header_write(const char *str, uint str_length TSRMLS_DC); PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size, zend_bool erase TSRMLS_DC);