diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-07 18:17:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-07 18:17:20 -0800 |
| commit | 03800743156fe4f331a10c0983b9d633bed3a687 (patch) | |
| tree | 56b7e501ff7ebaf057849108c839fff569aa8f39 /cache.h | |
| parent | 7481ebe9918771a9269c7fd0e91e855f18f2bc52 (diff) | |
| parent | 609a2289d76fd9a7dddceabc63d1654fe61e0ffb (diff) | |
| download | git-03800743156fe4f331a10c0983b9d633bed3a687.tar.gz git-03800743156fe4f331a10c0983b9d633bed3a687.tar.xz | |
Merge branch 'ds/maint-deflatebound'
* ds/maint-deflatebound:
Improve accuracy of check for presence of deflateBound.
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,7 +7,7 @@ #include SHA1_HEADER #include <zlib.h> -#if ZLIB_VERNUM < 0x1200 +#if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200 #define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11) #endif |