From efd1b888101a4ba1e33e1ade69ca891019276468 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Tue, 12 Mar 2013 21:50:38 +0000
Subject: Fix some clang warnings

---
 Makefile                        | 2 +-
 src/asm/ftola.c                 | 4 ++--
 src/opusfile-0.2/src/opusfile.c | 1 -
 src/qcommon/q_platform.h        | 4 ----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 63e618e0..2d8f2b49 100644
--- a/Makefile
+++ b/Makefile
@@ -876,7 +876,7 @@ endif
 ifeq ($(USE_CODEC_OPUS),1)
   CLIENT_CFLAGS += -DUSE_CODEC_OPUS
   ifeq ($(USE_INTERNAL_OPUS),1)
-    CLIENT_CFLAGS += -DOPUS_BUILD -DFLOATING_POINT -DUSE_ALLOCA \
+    CLIENT_CFLAGS += -DOPUS_BUILD -DHAVE_LRINTF -DFLOATING_POINT -DUSE_ALLOCA \
       -I$(OPUSDIR)/include -I$(OPUSDIR)/celt -I$(OPUSDIR)/silk \
       -I$(OPUSDIR)/silk/float
 
diff --git a/src/asm/ftola.c b/src/asm/ftola.c
index cfa44381..f1bea62e 100644
--- a/src/asm/ftola.c
+++ b/src/asm/ftola.c
@@ -62,7 +62,7 @@ int qvmftolsse(void)
 long qftolx87(float f)
 {
   long retval;
-  unsigned short oldcw;
+  unsigned short oldcw = 0;
 
   __asm__ volatile
   (
@@ -82,7 +82,7 @@ long qftolx87(float f)
 int qvmftolx87(void)
 {
   int retval;
-  unsigned short oldcw;
+  unsigned short oldcw = 0;
 
   __asm__ volatile
   (
diff --git a/src/opusfile-0.2/src/opusfile.c b/src/opusfile-0.2/src/opusfile.c
index 31d013a9..812c2c45 100644
--- a/src/opusfile-0.2/src/opusfile.c
+++ b/src/opusfile-0.2/src/opusfile.c
@@ -2935,7 +2935,6 @@ static const float OP_STEREO_DOWNMIX[OP_NCHANNELS_MAX-2][OP_NCHANNELS_MAX][2]={
 
 static int op_stereo_filter(OggOpusFile *_of,void *_dst,int _dst_sz,
  op_sample *_src,int _nsamples,int _nchannels){
-  _of=_of;
   _nsamples=OP_MIN(_nsamples,_dst_sz>>1);
   if(_nchannels==2)memcpy(_dst,_src,_nsamples*2*sizeof(*_src));
   else{
diff --git a/src/qcommon/q_platform.h b/src/qcommon/q_platform.h
index 03ea6e36..cf3f00f4 100644
--- a/src/qcommon/q_platform.h
+++ b/src/qcommon/q_platform.h
@@ -180,11 +180,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define OS_STRING "kFreeBSD"
 #endif
 
-#ifdef __clang__
-#define ID_INLINE static inline
-#else
 #define ID_INLINE inline
-#endif
 
 #define PATH_SEP '/'
 
-- 
cgit