mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent ad77690fe4 7f49036f28
commit f4e89b96d8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 * Use default 15 bits, +16 is to generate gzip header/trailer
* instead of the zlib wrapper. * 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) 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 * Use default 15 bits, negate the value to get raw compressed
* data without zlib header and trailer. * 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) int git_deflate_abort(git_zstream *strm)