diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:38:30 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:38:30 -0400 |
| commit | 1f589a2bd44ba835ad1b009a5d83abd453724829 (patch) | |
| tree | ec84d715d1ff049cc61f5eaf18db21eb7f3bab40 /ext/bz2 | |
| parent | bb01389fbd53ec1cbcb80d0681a37cca1267891a (diff) | |
| download | php-1f589a2bd44ba835ad1b009a5d83abd453724829.tar.gz | |
Imported Upstream version 5.2.5upstream/5.2.5
Diffstat (limited to 'ext/bz2')
| -rw-r--r-- | ext/bz2/php_bz2.h | 4 | ||||
| -rw-r--r-- | ext/bz2/tests/005.phpt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/bz2/php_bz2.h b/ext/bz2/php_bz2.h index 8abf33414..a547f8c5c 100644 --- a/ext/bz2/php_bz2.h +++ b/ext/bz2/php_bz2.h @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_bz2.h,v 1.7.2.1.2.3 2007/01/01 09:35:48 sebastian Exp $ */ +/* $Id: php_bz2.h,v 1.7.2.1.2.4 2007/09/12 11:44:25 jani Exp $ */ #ifndef PHP_BZ2_H #define PHP_BZ2_H @@ -51,7 +51,7 @@ PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode, #define php_stream_bz2open_from_BZFILE(bz, mode, innerstream) _php_stream_bz2open_from_BZFILE((bz), (mode), (innerstream) STREAMS_CC TSRMLS_CC) #define php_stream_bz2open(wrapper, path, mode, options, opened_path) _php_stream_bz2open((wrapper), (path), (mode), (options), (opened_path), NULL STREAMS_CC TSRMLS_CC) -php_stream_filter_factory php_bz2_filter_factory; +extern php_stream_filter_factory php_bz2_filter_factory; extern php_stream_ops php_stream_bz2io_ops; #define PHP_STREAM_IS_BZIP2 &php_stream_bz2io_ops diff --git a/ext/bz2/tests/005.phpt b/ext/bz2/tests/005.phpt index 48323531e..fc2235d62 100644 --- a/ext/bz2/tests/005.phpt +++ b/ext/bz2/tests/005.phpt @@ -37,10 +37,10 @@ var_dump(bzdecompress($data2)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: Wrong parameter count for bzcompress() in %s on line %d NULL -string(%d) "BZ%s" +string(%d) "BZ%a" int(-2) int(-2) int(-2) |