Happy now, GCC?

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;

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();
 

indra/llui/lllineeditor.cpp

@@ -56,7 +56,6 @@
 #include "lluictrlfactory.h"
 #include "llclipboard.h"
 
-#include "../newview/llviewercontrol.h"
 //
 // Imported globals
 //

indra/llui/lltexteditor.cpp

@@ -60,7 +60,6 @@
 #include "lltextparser.h"
 #include <queue>
 #include "llmenugl.h"
-#include "../newview/llviewercontrol.h"
 
 // 
 // Globals