summaryrefslogtreecommitdiff
path: root/main/php_streams.h
diff options
context:
space:
mode:
authorArnaud Le Blanc <lbarnaud@php.net>2009-04-19 17:10:52 +0000
committerArnaud Le Blanc <lbarnaud@php.net>2009-04-19 17:10:52 +0000
commit91e30c22d1bf96ca1566c059b9e73af505f8d47b (patch)
treedb40416e09af6cf3eee96412363c10872ad42586 /main/php_streams.h
parent8b083a99382a532dcce5f75d6f467211b84e4f19 (diff)
downloadphp-git-91e30c22d1bf96ca1566c059b9e73af505f8d47b.tar.gz
MFH: Better fix for #47997
Diffstat (limited to 'main/php_streams.h')
-rwxr-xr-xmain/php_streams.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/main/php_streams.h b/main/php_streams.h
index 4986287025..1a9c313262 100755
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -416,13 +416,11 @@ END_EXTERN_C()
* Uses mmap if the src is a plain file and at offset 0 */
#define PHP_STREAM_COPY_ALL ((size_t)-1)
-#define PHP_STREAM_FAILURE ((size_t)-1)
-
BEGIN_EXTERN_C()
PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size_t maxlen STREAMS_DC TSRMLS_DC);
#define php_stream_copy_to_stream(src, dest, maxlen) _php_stream_copy_to_stream((src), (dest), (maxlen) STREAMS_CC TSRMLS_CC)
-PHPAPI size_t _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size_t maxlen STREAMS_DC TSRMLS_DC);
-#define php_stream_copy_to_stream_ex(src, dest, maxlen) _php_stream_copy_to_stream_ex((src), (dest), (maxlen) STREAMS_CC TSRMLS_CC)
+PHPAPI size_t _php_stream_copy_to_stream_ex(php_stream *src, php_stream *dest, size_t maxlen, size_t *len STREAMS_DC TSRMLS_DC);
+#define php_stream_copy_to_stream_ex(src, dest, maxlen, len) _php_stream_copy_to_stream_ex((src), (dest), (maxlen), (len) STREAMS_CC TSRMLS_CC)
/* read all data from stream and put into a buffer. Caller must free buffer when done.