fix #40335 (Compile fails when using GCC 4.1.1/binutils 2.17)

diff --git a/NEWS b/NEWS
index b65c73011585ce7a9b987587b30d512cdf2a4461..b0f568e26dd6ed42406190423c5e4779c497efc3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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).

diff --git a/main/output.c b/main/output.c
index 2fdbc83ca40c42a15dcfe184d4d86a28ab00532c..2ced9c3461d308cb33f0baf68c359765f24edaa5 100644 (file)
--- a/main/output.c
+++ b/main/output.c
@@ -49,7 +49,7 @@ php_output_globals output_globals;
 #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;

diff --git a/main/php_output.h b/main/php_output.h
index 32def2b04bfffc5c9c6a35cd2502f2f1ab698580..d3722ccb3e92670a5655f6b0acf08fe2a38466f4 100644 (file)
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -27,6 +27,7 @@ PHPAPI void php_output_startup(void);
 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);