From: Yann Collet <yann.collet.73@gmail.com>
Date: Sun, 25 Jan 2015 12:19:12 +0000 (+0100)
Subject: Fixed : minor warnings under Visual 32 bits
X-Git-Tag: v0.1.0~10^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb81417323f56acf84d8adf3432785d487f0fb7b;p=thirdparty%2Fzstd.git

Fixed : minor warnings under Visual 32 bits
---

diff --git a/lib/fse.c b/lib/fse.c
index 526f822a8..02c8ed615 100644
--- a/lib/fse.c
+++ b/lib/fse.c
@@ -195,9 +195,9 @@ static void FSE_writeLE64(void* memPtr, U64 val64)
 static size_t FSE_readLEST(const void* memPtr)
 {
     if (sizeof(size_t)==4)
-        return FSE_readLE32(memPtr);
+        return (size_t)FSE_readLE32(memPtr);
     else
-        return FSE_readLE64(memPtr);
+        return (size_t)FSE_readLE64(memPtr);
 }
 
 static void FSE_writeLEST(void* memPtr, size_t val)
diff --git a/lib/zstd.c b/lib/zstd.c
index dcc08bc09..b9457595d 100644
--- a/lib/zstd.c
+++ b/lib/zstd.c
@@ -382,7 +382,8 @@ static unsigned ZSTD_NbCommonBytes (register size_t val)
             return (__builtin_clzll(val) >> 3);
 #       else
             unsigned r;
-            if (!(val>>32)) { r=4; } else { r=0; val>>=32; }
+            const unsigned n32 = sizeof(size_t)*4;   /* calculate this way due to compiler complaining in 32-bits mode */
+            if (!(val>>n32)) { r=4; } else { r=0; val>>=n32; }
             if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
             r += (!val);
             return r;