From 17867ced036e4f184a99abcd2dc0e510fe764af9 Mon Sep 17 00:00:00 2001
From: Yann Collet <yann.collet.73@gmail.com>
Date: Tue, 7 Jul 2015 00:14:27 -0800
Subject: [PATCH] Fixed minor clang warnings

---
 lib/zstd.c         | 2 +-
 programs/Makefile  | 3 ++-
 programs/zstdcli.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/zstd.c b/lib/zstd.c
index 277307fbc..880bd8eac 100644
--- a/lib/zstd.c
+++ b/lib/zstd.c
@@ -456,7 +456,7 @@ static unsigned ZSTD_NbCommonBytes (register size_t 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);
+            return (__builtin_clz((U32)val) >> 3);
 #       else
             unsigned r;
             if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
diff --git a/programs/Makefile b/programs/Makefile
index 0526c36c8..a6304db55 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -36,7 +36,8 @@ DESTDIR?=
 PREFIX ?= /usr
 CFLAGS ?= -O3
 CFLAGS += -std=c99 -Wall -Wextra -Wundef -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -DZSTD_VERSION=\"$(RELEASE)\"
-FLAGS   = -I../lib $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+LDFLAGS = -I../lib
+FLAGS   = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MOREFLAGS)
 
 BINDIR=$(PREFIX)/bin
 MANDIR=$(PREFIX)/share/man/man1
diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index 11a5ec89c..7fa85c855 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -174,7 +174,7 @@ int main(int argc, char** argv)
     char extension[] = ZSTD_EXTENSION;
 
     /* Pick out basename component. Don't rely on stdlib because of conflicting behaviour. */
-    for (i = strlen(programName); i > 0; i--)
+    for (i = (int)strlen(programName); i > 0; i--)
     {
         if (programName[i] == '/')
         {