summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--config.mak.uname1
-rw-r--r--reftable/block.c4
3 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 94ba729..d1c2a8a 100644
--- a/Makefile
+++ b/Makefile
@@ -1760,7 +1760,7 @@ endif
ifdef NO_UNCOMPRESS2
BASIC_CFLAGS += -DNO_UNCOMPRESS2
- LIB_OBJS += compat/zlib-uncompress2.o
+ REFTABLE_OBJS += compat/zlib-uncompress2.o
endif
ifdef NO_POSIX_GOODIES
diff --git a/config.mak.uname b/config.mak.uname
index 59726d6..074dc23 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -260,6 +260,7 @@ ifeq ($(uname_S),FreeBSD)
FILENO_IS_A_MACRO = UnfortunatelyYes
endif
ifeq ($(uname_S),OpenBSD)
+ NO_UNCOMPRESS2 = YesPlease
NO_STRCASESTR = YesPlease
NO_MEMMEM = YesPlease
USE_ST_TIMESPEC = YesPlease
diff --git a/reftable/block.c b/reftable/block.c
index 92f8e5a..eb5268d 100644
--- a/reftable/block.c
+++ b/reftable/block.c
@@ -16,7 +16,9 @@ https://developers.google.com/open-source/licenses/bsd
#include <zlib.h>
#ifdef NO_UNCOMPRESS2
-/* This is uncompress2, which is only available in zlib as of 2017.
+/*
+ * This is uncompress2, which is only available in zlib >= 1.2.9
+ * (released as of early 2017)
*/
int uncompress2(Bytef *dest, uLongf *destLen, const Bytef *source,
uLong *sourceLen);