From: Antony Dovgal <tony2001@php.net>
Date: Mon, 12 Feb 2007 17:13:22 +0000 (+0000)
Subject: fix #40335 (Compile fails when using GCC 4.1.1/binutils 2.17)
X-Git-Tag: php-4.4.5~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faede0995462a4723116e19ab35a315518b76922;p=php

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

diff --git a/NEWS b/NEWS
index b65c730115..b0f568e26d 100644
--- 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 2fdbc83ca4..2ced9c3461 100644
--- 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 32def2b04b..d3722ccb3e 100644
--- 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);