summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVicent Martí <tanoku@gmail.com>2012-02-15 16:56:56 +0100
committerVicent Martí <tanoku@gmail.com>2012-02-15 16:56:56 +0100
commit0c3bae6268c404fc3717cc90ba1bc5db91c8cbe6 (patch)
treee7052e74d5437865d1a5c4765cc857415c171e4e /include
parent66faeb5c5d38541c070a02bc53ad0846a4c5fcc9 (diff)
downloadlibgit2-0c3bae6268c404fc3717cc90ba1bc5db91c8cbe6.tar.gz
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.
Diffstat (limited to 'include')
-rw-r--r--include/git2.h1
-rw-r--r--include/git2/zlib.h40
2 files changed, 0 insertions, 41 deletions
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