From: Mika Lindqvist Date: Mon, 5 Mar 2018 06:58:14 +0000 (+0200) Subject: Fix build on ARM and gcc 4.x. X-Git-Tag: 1.9.9-b1~637 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f53f3cd93b712e1f84b7d67177c4141691bbbcb;p=thirdparty%2Fzlib-ng.git Fix build on ARM and gcc 4.x. --- diff --git a/gzendian.h b/gzendian.h index 267467d1..92da573b 100644 --- a/gzendian.h +++ b/gzendian.h @@ -15,6 +15,8 @@ # else # error Unknown endianness! # endif +#elif defined(__linux__) +# include #elif defined(__APPLE__) || defined(__arm__) || defined(__aarch64__) # include #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) diff --git a/inflate.c b/inflate.c index 93d1df34..8b3e930d 100644 --- a/inflate.c +++ b/inflate.c @@ -1349,7 +1349,7 @@ int ZEXPORT PREFIX(inflateGetHeader)(PREFIX3(stream) *strm, PREFIX(gz_headerp) h called again with more data and the *have state. *have is initialized to zero for the first call. */ -static unsigned syncsearch(uint32_t *have, const unsigned char *buf, uint32_t len) { +static uint32_t syncsearch(uint32_t *have, const unsigned char *buf, uint32_t len) { uint32_t got; uint32_t next;