]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Fixed : minor warnings under Visual 32 bits 3/head
authorYann Collet <yann.collet.73@gmail.com>
Sun, 25 Jan 2015 12:19:12 +0000 (13:19 +0100)
committerYann Collet <yann.collet.73@gmail.com>
Sun, 25 Jan 2015 12:19:12 +0000 (13:19 +0100)
lib/fse.c
lib/zstd.c

index 526f822a8bb6d5bc046f5294ad13f398f644d4af..02c8ed61520a70b3209b92acfea4ac270f2a3518 100644 (file)
--- 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)
index dcc08bc09f8c1d56f04d79fa552f43959127b0e8..b9457595d838f8abb35a38723d27a8a8bc0a3d2f 100644 (file)
@@ -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;