From 2a584cb0fdc4065ccd3173495c42c5e6bbc370a8 Mon Sep 17 00:00:00 2001
From: unknown <shyotl@gmail.com>
Date: Tue, 5 Oct 2010 01:33:35 -0500
Subject: [PATCH] Happy now, GCC?

---
 indra/llaudio/llaudioengine.cpp     | 2 +-
 indra/llimagej2coj/llimagej2coj.cpp | 2 +-
 indra/llui/lllineeditor.cpp         | 1 -
 indra/llui/lltexteditor.cpp         | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index 98a7d5265..cf61609b7 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -992,7 +992,7 @@ LLAudioData * LLAudioEngine::getAudioData(const LLUUID &audio_uuid)
 				delete sourcep;
 				if(chan)
 					chan->cleanup();
-				iter2 = mAllSources.erase(iter2);
+				 mAllSources.erase(iter2++);
 			}
 			else
 				++iter2;
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 8f78d43ae..a9dda75a8 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -330,7 +330,7 @@ BOOL LLImageJ2COJ::encodeImpl(LLImageJ2C &base, const LLImageRaw &raw_image, con
 	OPJ_COLOR_SPACE color_space = CLRSPC_SRGB;
 	opj_image_cmptparm_t cmptparm[MAX_COMPS];
 	opj_image_t * image = NULL;
-	S32 numcomps = min(raw_image.getComponents(),MAX_COMPS); //Clamp avoid overrunning buffer -Shyotl
+	S32 numcomps = llmin((S32)raw_image.getComponents(),(S32)MAX_COMPS); //Clamp avoid overrunning buffer -Shyotl
 	S32 width = raw_image.getWidth();
 	S32 height = raw_image.getHeight();
 
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 145961bc1..4ff31ed20 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -56,7 +56,6 @@
 #include "lluictrlfactory.h"
 #include "llclipboard.h"
 
-#include "../newview/llviewercontrol.h"
 //
 // Imported globals
 //
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 5833b2bb3..9c6a2d43a 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -60,7 +60,6 @@
 #include "lltextparser.h"
 #include <queue>
 #include "llmenugl.h"
-#include "../newview/llviewercontrol.h"
 
 // 
 // Globals