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.

6 files changed, 7 insertions, 6 deletions

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);