summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2014-11-30 11:58:00 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2014-11-30 11:58:00 (GMT)
commitd0a6cccf75e147301b430a43bc9e591fdd80fce9 (patch)
treee478b0dde6dc6f5d301078b6051c0c87e05a4046
parent326cada9fadeedccef8934e11144f343ecdcabcb (diff)
downloadlz4-d0a6cccf75e147301b430a43bc9e591fdd80fce9.zip
lz4-d0a6cccf75e147301b430a43bc9e591fdd80fce9.tar.gz
lz4-d0a6cccf75e147301b430a43bc9e591fdd80fce9.tar.bz2
Fixed : some minor Visual warnings
-rw-r--r--lz4.c2
-rw-r--r--lz4hc.c4
-rw-r--r--programs/Makefile2
3 files changed, 6 insertions, 2 deletions
diff --git a/lz4.c b/lz4.c
index 9439b36..fb84955 100644
--- a/lz4.c
+++ b/lz4.c
@@ -369,7 +369,7 @@ static unsigned LZ4_NbCommonBytes (register size_t val)
{
# if defined(_MSC_VER) && !defined(LZ4_FORCE_SW_BITCOUNT)
unsigned long r = 0;
- _BitScanReverse( &r, val );
+ _BitScanReverse( &r, (unsigned long)val );
return (unsigned)(r>>3);
# elif defined(__GNUC__) && (GCC_VERSION >= 304) && !defined(LZ4_FORCE_SW_BITCOUNT)
return (__builtin_clz(val) >> 3);
diff --git a/lz4hc.c b/lz4hc.c
index a798cab..89f0db0 100644
--- a/lz4hc.c
+++ b/lz4hc.c
@@ -57,6 +57,10 @@ You can contact the author at :
# pragma clang diagnostic ignored "-Wunused-function"
#endif
+#if defined(_MSC_VER) /* Visual Studio */
+# pragma warning(disable : 4201) /* disable: C4201: unnamed struct/union*/
+#endif
+
/**************************************
Common LZ4 definition
diff --git a/programs/Makefile b/programs/Makefile
index fcfb32c..8a3ed95 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -193,7 +193,7 @@ test-mem: lz4 datagen fuzzer frametest
./datagen -g16MB > tmp
valgrind --leak-check=yes ./lz4 -9 -B5D -f tmp /dev/null
./datagen -g256MB > tmp
- valgrind --leak-check=yes ./lz4 -B4D -f tmp /dev/null
+ valgrind --leak-check=yes ./lz4 -B4D -f -vq tmp /dev/null
rm tmp
valgrind --leak-check=yes ./fuzzer -i50 -t0
valgrind --leak-check=yes ./frametest -i100