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

@@ -13,7 +13,6 @@
 #include "git2/common.h"
 #include "git2/threads.h"
 #include "git2/errors.h"
-#include "git2/zlib.h"
 
 #include "git2/types.h"
 

include/git2/zlib.h

-/*
- * 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

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

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"

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"

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"

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"

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