diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-10-15 19:41:27 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-10-15 19:41:27 +0200 |
| commit | d2ab6e1d15f58cb4f53c0a69c438c0721264455a (patch) | |
| tree | 5caf9e2fa2b3e6217bd94e49331852bed12079d0 /main/php_streams.h | |
| parent | 7e116a3baa39808696ead8073965239015df1c50 (diff) | |
| parent | 2109f5bfe362fdfe840a7014bd62682de3d95c5c (diff) | |
| download | php-git-d2ab6e1d15f58cb4f53c0a69c438c0721264455a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
removing the NEWS entry as we had to revert this fix for now
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Revert "fix TS build"
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
Revert "Bug #41631: Fix regression from first attempt (6569db8)"
Diffstat (limited to 'main/php_streams.h')
| -rw-r--r-- | main/php_streams.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/main/php_streams.h b/main/php_streams.h index 34d7676f09..77a2234d92 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -295,9 +295,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 |