aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-05 18:01:00 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-05 18:01:00 -0800
commit141b6b83d7ca5bd32d55a0a7e08384084d081557 (patch)
tree5c0aea567c793844ba1568c77b3eb3bea2e6fe81 /cache.h
parentcc91e1bd0537442339c4fd233b98a4b30e9dbe29 (diff)
parent39c68542fc8d8477f2080c99efedb9dce975abc6 (diff)
downloadgit-141b6b83d7ca5bd32d55a0a7e08384084d081557.tar.gz
git-141b6b83d7ca5bd32d55a0a7e08384084d081557.tar.xz
Merge branch 'lt/maint-wrap-zlib' into maint
* lt/maint-wrap-zlib: Wrap inflate and other zlib routines for better error reporting Conflicts: http-push.c http-walker.c sha1_file.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 231c06d77..49e54fbe6 100644
--- a/cache.h
+++ b/cache.h
@@ -18,6 +18,10 @@
#define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
#endif
+void git_inflate_init(z_streamp strm);
+void git_inflate_end(z_streamp strm);
+int git_inflate(z_streamp strm, int flush);
+
#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
#define DTYPE(de) ((de)->d_type)
#else