Merge branch 'rs/archive-zip-raw-compression'

* rs/archive-zip-raw-compression:
  zlib: fix compilation failures with Sun C Compilaer
This commit is contained in:
Junio C Hamano 2013-04-22 09:49:21 -07:00
commit f4e89b96d8

4
zlib.c
View file

@ -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)