Merge branch 'bg/format-patch-N'

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 497b9f962db0ca7f7c8dda8e848126e22da6685f..f0a25c7ffcd47d663f2d41cd29dbabc57c2cab93 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -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