Revert "Merge branch 'PHP-5.4' into PHP-5.5"

This reverts commit 30a73658c6, reversing
changes made to 7fac56e072.
This commit is contained in:
Ferenc Kovacs 2014-10-15 19:33:31 +02:00
parent 528e4166a6
commit 7b8222aa44
3 changed files with 4 additions and 20 deletions

View file

@ -297,9 +297,6 @@ PHPAPI size_t _php_stream_write(php_stream *stream, const char *buf, size_t coun
#define php_stream_write_string(stream, str) _php_stream_write(stream, str, strlen(str) TSRMLS_CC)
#define php_stream_write(stream, buf, count) _php_stream_write(stream, (buf), (count) TSRMLS_CC)
PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC);
#define php_stream_fill_read_buffer(stream, size) _php_stream_fill_read_buffer((stream), (size) TSRMLS_CC)
#ifdef ZTS
PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
#else