diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-17 06:14:17 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-17 06:14:17 +0100 |
| commit | b574c8d846dbdbaaad1e96ae365d452bc5cd6d64 (patch) | |
| tree | c8adb9c388d4bc08bf00ec6153f1e7ea6e669a37 /cache.h | |
| parent | Fix per-directory exclude handing for "git add" (diff) | |
| parent | Improve accuracy of check for presence of deflateBound. (diff) | |
| download | git-b574c8d846dbdbaaad1e96ae365d452bc5cd6d64.tar.xz git-b574c8d846dbdbaaad1e96ae365d452bc5cd6d64.zip | |
Merge branch 'ds/maint-deflatebound' into maint
* 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
@@ -6,7 +6,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 |