diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-22 09:49:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 09:49:21 -0700 |
| commit | f4e89b96d8fbc8735bcbb3bad3ad9bf3051b7c83 (patch) | |
| tree | 78ac0a6a410b2a76db75477cb67c1fb2a39b35fe | |
| parent | Merge branch 'ta/glossary' (diff) | |
| parent | zlib: fix compilation failures with Sun C Compilaer (diff) | |
| download | tgif-f4e89b96d8fbc8735bcbb3bad3ad9bf3051b7c83.tar.xz | |
Merge branch 'rs/archive-zip-raw-compression'
* rs/archive-zip-raw-compression:
zlib: fix compilation failures with Sun C Compilaer
| -rw-r--r-- | zlib.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -189,7 +189,7 @@ void git_deflate_init_gzip(git_zstream *strm, int level) * Use default 15 bits, +16 is to generate gzip header/trailer * instead of the zlib wrapper. */ - return do_git_deflate_init(strm, level, 15 + 16); + do_git_deflate_init(strm, level, 15 + 16); } void git_deflate_init_raw(git_zstream *strm, int level) @@ -198,7 +198,7 @@ void git_deflate_init_raw(git_zstream *strm, int level) * Use default 15 bits, negate the value to get raw compressed * data without zlib header and trailer. */ - return do_git_deflate_init(strm, level, -15); + do_git_deflate_init(strm, level, -15); } int git_deflate_abort(git_zstream *strm) |