From 76a35059f2d4dfb17223de9bff493379793f5cc0 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 15:11:10 -0700
Subject: Update to build on Xcode 6.0: clang detecting unsigned int (size_t)
 comparison with <0 [-Wtautological-compare]

---
 indra/llaudio/llaudiodecodemgr.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/llaudio')

diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 20a7afc748..56a91ee39b 100755
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -247,8 +247,7 @@ BOOL LLVorbisDecodeState::initDecode()
 		LL_WARNS("AudioEngine") << "Illegal sample count: " << sample_count << LL_ENDL;
 	}
 	
-	if( size_guess > LLVORBIS_CLIP_REJECT_SIZE ||
-	    size_guess < 0)
+	if( size_guess > LLVORBIS_CLIP_REJECT_SIZE )
 	{
 		abort_decode = true;
 		LL_WARNS("AudioEngine") << "Illegal sample size: " << size_guess << LL_ENDL;
-- 
cgit v1.2.3


From f708104e3785d20f3c02c9c9503a5a7f15b81b8e Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 15:14:21 -0700
Subject: Update to build on Xcode 6.0: more removal of unused variables
 [-Wunused-variable]

---
 indra/llaudio/llaudiodecodemgr.cpp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'indra/llaudio')

diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 56a91ee39b..77e57b14f5 100755
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -696,11 +696,3 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
 	LL_DEBUGS("AudioEngine") << "addDecodeRequest for " << uuid << " no file available" << LL_ENDL;
 	return FALSE;
 }
-
-#if LL_DARWIN || LL_LINUX
-// HACK: to fool the compiler into not emitting unused warnings.
-namespace {
-	const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY, 
-		OV_CALLBACKS_STREAMONLY_NOCLOSE};
-}
-#endif
-- 
cgit v1.2.3


From 9960145ed0d3057c9b3aa9ab8bd55b180bcbd46c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 15 Dec 2014 12:52:26 -0500
Subject: remove redundant include of Audio.cmake

---
 indra/llaudio/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/llaudio')

diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index 1b2bdb9888..e943dd5d5c 100755
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -3,7 +3,6 @@
 project(llaudio)
 
 include(00-Common)
-include(Audio)
 include(LLAudio)
 include(FMODEX)
 include(OPENAL)
-- 
cgit v1.2.3