Fix rev-list when showing objects involving submodules

diff --git a/cache.h b/cache.h
index fc195bc47c9474c2a4c98ca058f0bb22e07b05a2..60af6d35794beb67dd7165668677cfbca9334f30 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -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
 
@@ -571,6 +571,7 @@ extern int pager_in_use;
 extern int pager_use_color;
 
 extern char *editor_program;
+extern char *excludes_file;
 
 /* base85 */
 int decode_85(char *dst, const char *line, int linelen);