From 0c3bae6268c404fc3717cc90ba1bc5db91c8cbe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicent=20Mart=C3=AD?= <tanoku@gmail.com>
Date: Wed, 15 Feb 2012 16:56:56 +0100
Subject: [PATCH] zlib: Remove custom `git2/zlib.h` header

This is legacy compat stuff for when `deflateBound` is not defined, but
we're not embedding zlib and that function is always available. Kill
that with fire.
---
 include/git2.h      |  1 -
 include/git2/zlib.h | 40 ----------------------------------------
 src/filebuf.h       |  2 +-
 src/indexer.c       |  3 ++-
 src/odb.c           |  2 +-
 src/odb_loose.c     |  2 +-
 src/odb_pack.c      |  2 +-
 src/pack.c          |  2 +-
 8 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 include/git2/zlib.h

diff --git a/include/git2.h b/include/git2.h
index d68a04efd..3d7c4f626 100644
--- a/include/git2.h
+++ b/include/git2.h
@@ -13,7 +13,6 @@
 #include "git2/common.h"
 #include "git2/threads.h"
 #include "git2/errors.h"
-#include "git2/zlib.h"
 
 #include "git2/types.h"
 
diff --git a/include/git2/zlib.h b/include/git2/zlib.h
deleted file mode 100644
index a28efd988..000000000
--- a/include/git2/zlib.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2009-2012 the libgit2 contributors
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-#ifndef INCLUDE_git_zlib_h__
-#define INCLUDE_git_zlib_h__
-
-#include <zlib.h>
-
-/**
- * @file git2/zlib.h
- * @brief Git data compression routines
- * @defgroup git_zlib Git data compression routines
- * @ingroup Git
- * @{
- */
-GIT_BEGIN_DECL
-
-#if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200
-/**
- * deflateBound returns an upper bound on the compressed size.
- *
- * This is a stub function used when zlib does not supply the
- * deflateBound() implementation itself.
- *
- * @param stream the stream pointer.
- * @param s total length of the source data (in bytes).
- * @return maximum length of the compressed data.
- */
-GIT_INLINE(size_t) deflateBound(z_streamp stream, size_t s)
-{
-	return (s + ((s + 7) >> 3) + ((s + 63) >> 6) + 11);
-}
-#endif
-
-/** @} */
-GIT_END_DECL
-#endif
diff --git a/src/filebuf.h b/src/filebuf.h
index 1e84bbe1a..371215391 100644
--- a/src/filebuf.h
+++ b/src/filebuf.h
@@ -9,7 +9,7 @@
 
 #include "fileops.h"
 #include "hash.h"
-#include "git2/zlib.h"
+#include <zlib.h>
 
 #ifdef GIT_THREADS
 #	define GIT_FILEBUF_THREADS
diff --git a/src/indexer.c b/src/indexer.c
index c14b8e238..de1e5dc52 100644
--- a/src/indexer.c
+++ b/src/indexer.c
@@ -5,9 +5,10 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
+#include <zlib.h>
+
 #include "git2/indexer.h"
 #include "git2/object.h"
-#include "git2/zlib.h"
 #include "git2/oid.h"
 
 #include "common.h"
diff --git a/src/odb.c b/src/odb.c
index bf6b07fbb..77287aa1e 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -6,7 +6,7 @@
  */
 
 #include "common.h"
-#include "git2/zlib.h"
+#include <zlib.h>
 #include "git2/object.h"
 #include "fileops.h"
 #include "hash.h"
diff --git a/src/odb_loose.c b/src/odb_loose.c
index 6cd07f3c0..bb2b7b5f5 100644
--- a/src/odb_loose.c
+++ b/src/odb_loose.c
@@ -6,7 +6,7 @@
  */
 
 #include "common.h"
-#include "git2/zlib.h"
+#include <zlib.h>
 #include "git2/object.h"
 #include "git2/oid.h"
 #include "fileops.h"
diff --git a/src/odb_pack.c b/src/odb_pack.c
index 3f6bb8eb3..9e1004eb8 100644
--- a/src/odb_pack.c
+++ b/src/odb_pack.c
@@ -6,7 +6,7 @@
  */
 
 #include "common.h"
-#include "git2/zlib.h"
+#include <zlib.h>
 #include "git2/repository.h"
 #include "git2/oid.h"
 #include "fileops.h"
diff --git a/src/pack.c b/src/pack.c
index fcb097e8f..0d618324b 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -14,7 +14,7 @@
 #include "fileops.h"
 
 #include "git2/oid.h"
-#include "git2/zlib.h"
+#include <zlib.h>
 
 static int packfile_open(struct git_pack_file *p);
 static off_t nth_packed_object_offset(const struct git_pack_file *p, uint32_t n);