From: Mika Lindqvist <postmaster@raasu.org>
Date: Wed, 13 May 2015 17:36:09 +0000 (+0300)
Subject: Fix building under MinGW64.
X-Git-Tag: 1.9.9-b1~821^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35ce184c6827f4d204791488020a92265a37119e;p=thirdparty%2Fzlib-ng.git

Fix building under MinGW64.
---

diff --git a/arch/x86/crc_folding.c b/arch/x86/crc_folding.c
index f16cb82ea..7b04890d0 100644
--- a/arch/x86/crc_folding.c
+++ b/arch/x86/crc_folding.c
@@ -285,7 +285,7 @@ ZLIB_INTERNAL void crc_fold_copy(deflate_state *const s,
         goto partial;
     }
 
-    algn_diff = (0 - (unsigned long)src) & 0xF;
+    algn_diff = (0 - (uintptr_t)src) & 0xF;
     if (algn_diff) {
         xmm_crc_part = _mm_loadu_si128((__m128i *)src);
         _mm_storeu_si128((__m128i *)dst, xmm_crc_part);
diff --git a/arch/x86/deflate_quick.c b/arch/x86/deflate_quick.c
index 2f5d63ba3..cf6da76dc 100644
--- a/arch/x86/deflate_quick.c
+++ b/arch/x86/deflate_quick.c
@@ -22,7 +22,7 @@ extern void flush_pending  (z_stream *strm);
 local inline long compare258(const unsigned char *const src0,
         const unsigned char *const src1)
 {
-    long ax, dx, cx;
+    uintptr_t ax, dx, cx;
     __m128i xmm_src0;
 
     ax = 16;
@@ -152,7 +152,7 @@ local inline Pos quick_insert_string(deflate_state *const s, const Pos str)
         "crc32l (%[window], %[str], 1), %0\n\t"
     : "+r" (h)
     : [window] "r" (s->window),
-      [str] "r" ((long)str)
+      [str] "r" ((uintptr_t)str)
     );
 
     ret = s->head[h & s->hash_mask];
diff --git a/configure b/configure
index e64174538..336f630b1 100755
--- a/configure
+++ b/configure
@@ -266,7 +266,7 @@ if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
         SHAREDLIBV=''
         SHAREDTARGET=$SHAREDLIB
         IMPORTLIB='libz.dll.a'
-        LDSHARED=${LDSHARED-"$cc -shared -Wl,--out-implib,${IMPORTLIB},--version-script,${SRCDIR}/zlib.map"}
+        LDSHARED=${LDSHARED-"$cc -shared -Wl,--out-implib=${IMPORTLIB} -Wl,--version-script=${SRCDIR}/zlib.map"}
         LDSHAREDLIBC=""
         DEFFILE='win32/zlib.def'
         RC='windres'