diff options
| author | David Symonds <dsymonds@gmail.com> | 2007-11-07 14:24:28 +1100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-07 17:06:14 -0800 |
| commit | 609a2289d76fd9a7dddceabc63d1654fe61e0ffb (patch) | |
| tree | 1d1d2719a4936c8958259a1772a31b7f6baac6c8 /cache.h | |
| parent | 6d0618a820a20846d60b665897fcce600f452eec (diff) | |
| download | git-609a2289d76fd9a7dddceabc63d1654fe61e0ffb.tar.gz git-609a2289d76fd9a7dddceabc63d1654fe61e0ffb.tar.xz | |
Improve accuracy of check for presence of deflateBound.
ZLIB_VERNUM isn't defined in some zlib versions, so this patch does a proper
linking test in autoconf to see whether deflateBound exists in zlib. Also,
setting NO_DEFLATE_BOUND will also work for folk not using autoconf.
Signed-off-by: David Symonds <dsymonds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 |