Merge pull request #1142 from lioncash/linucks

Fix some warnings on Linux
dolphin-emu · Sep 23, 2014 · fb18d53 · fb18d53
2 parents 5271982 + 836ff6d
commit fb18d53
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Source/Core/Core/PowerPC/Gekko.h b/Source/Core/Core/PowerPC/Gekko.h
@@ -407,6 +407,7 @@ const u32 FPSCR_VXVC   = 1U << (31 - 12);
 const u32 FPSCR_VXSOFT = 1U << (31 - 21);
 const u32 FPSCR_VXSQRT = 1U << (31 - 22);
 const u32 FPSCR_VXCVI  = 1U << (31 - 23);
+const u32 FPSCR_VE     = 1U << (31 - 24);
 
 const u32 FPSCR_VX_ANY = FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI | FPSCR_VXZDZ | FPSCR_VXIMZ |
                          FPSCR_VXVC | FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI;

diff --git a/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp b/Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp
@@ -29,6 +29,7 @@ The register allocation is linear scan allocation.
 #include "Common/CPUDetect.h"
 #include "Common/MathUtil.h"
 #include "Core/HW/ProcessorInterface.h"
+#include "Core/PowerPC/Gekko.h"
 #include "Core/PowerPC/Jit64IL/JitIL.h"
 
 using namespace IREmitter;
@@ -1890,11 +1891,6 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress)
 			Jit->SetJumpTarget(pNan);
 			Jit->MOV(32, R(destreg), Imm32(0x1));
 
-			static const u32 FPSCR_VE = (u32)1 << (31 - 24);
-			static const u32 FPSCR_VXVC = (u32)1 << (31 - 12);
-			static const u32 FPSCR_VXSNAN = (u32)1 << (31 - 7);
-			static const u32 FPSCR_FX = (u32)1 << (31 - 0);
-
 			if (ordered)
 			{
 				// fcmpo

diff --git a/Source/Core/VideoBackends/OGL/RasterFont.cpp b/Source/Core/VideoBackends/OGL/RasterFont.cpp
@@ -216,7 +216,7 @@ void RasterFont::printMultilineText(const std::string& text, double start_x, dou
 			continue;
 		}
 
-		if ((u32) c < CHAR_OFFSET || (u32) c >= CHAR_COUNT + CHAR_OFFSET)
+		if (c < CHAR_OFFSET || c >= CHAR_COUNT + CHAR_OFFSET)
 			continue;
 
 		vertices[usage++] = x;