diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:33:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:33:04 -0700 |
| commit | eb4f4076aa89d38221ee513a5f28f22124029c90 (patch) | |
| tree | 8617f31f2dada1ec300dff9427f92ba00ea95500 /streaming.c | |
| parent | d37b2991b1edea76c01ec05cc383005b55c96e36 (diff) | |
| parent | e01503b523e79748ac91d876f506811c597d03cb (diff) | |
| download | git-eb4f4076aa89d38221ee513a5f28f22124029c90.tar.gz | |
Merge branch 'jc/zlib-wrap'
* jc/zlib-wrap:
zlib: allow feeding more than 4GB in one go
zlib: zlib can only process 4GB at a time
zlib: wrap deflateBound() too
zlib: wrap deflate side of the API
zlib: wrap inflateInit2 used to accept only for gzip format
zlib: wrap remaining calls to direct inflate/inflateEnd
zlib wrapper: refactor error message formatter
Conflicts:
sha1_file.c
Diffstat (limited to 'streaming.c')
| -rw-r--r-- | streaming.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming.c b/streaming.c index 91414f4592..25c9a209bb 100644 --- a/streaming.c +++ b/streaming.c @@ -66,7 +66,7 @@ struct filtered_istream { struct git_istream { const struct stream_vtbl *vtbl; unsigned long size; /* inflated size of full object */ - z_stream z; + git_zstream z; enum { z_unused, z_used, z_done, z_error } z_state; union { |