From 676daef3c7b1d2dc4ad178d7d799c994383b2512 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 3 Feb 2015 08:07:03 -0500
Subject: core: Fix some warnings on OSX

---
 src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 6 ++++--
 src/core/hle/kernel/kernel.cpp                 | 1 -
 src/core/hw/gpu.cpp                            | 2 --
 src/core/loader/loader.h                       | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index 96d71cd5..3be13de0 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -3553,7 +3553,6 @@ static tdstate decode_thumb_instr(arm_processor *cpu, uint32_t inst, addr_t addr
         case 26:
         case 27:
             if (((tinstr & 0x0F00) != 0x0E00) && ((tinstr & 0x0F00) != 0x0F00)){
-                u32 cond = (tinstr & 0x0F00) >> 8;
                 inst_index = table_length - 4;
                 *ptr_inst_base = arm_instruction_trans[inst_index](tinstr, inst_index);
             } else {
@@ -3693,6 +3692,9 @@ static bool InAPrivilegedMode(arm_core_t *core) {
 }
 
 unsigned InterpreterMainLoop(ARMul_State* state) {
+    #undef RM
+    #undef RS
+
     #define CRn             inst_cream->crn
     #define OPCODE_2        inst_cream->opcode_2
     #define CRm             inst_cream->crm
@@ -4999,7 +5001,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
             }
             uint32_t byte_mask = (BIT(inst, 16) ? 0xff : 0) | (BIT(inst, 17) ? 0xff00 : 0)
                         | (BIT(inst, 18) ? 0xff0000 : 0) | (BIT(inst, 19) ? 0xff000000 : 0);
-            uint32_t mask;
+            uint32_t mask = 0;
             if (!inst_cream->R) {
                 if (InAPrivilegedMode(cpu)) {
                     if ((operand & StateMask) != 0) {
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 7e0b9542..52dca4dd 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -97,7 +97,6 @@ ResultCode HandleTable::Close(Handle handle) {
         return ERR_INVALID_HANDLE;
 
     size_t slot = GetSlot(handle);
-    u16 generation = GetGeneration(handle);
 
     objects[slot] = nullptr;
 
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp
index 58eec300..aad0e5d0 100644
--- a/src/core/hw/gpu.cpp
+++ b/src/core/hw/gpu.cpp
@@ -202,8 +202,6 @@ template void Write<u8>(u32 addr, const u8 data);
 
 /// Update hardware
 static void VBlankCallback(u64 userdata, int cycles_late) {
-    auto& framebuffer_top = g_regs.framebuffer_config[0];
-
     frame_count++;
     last_skip_frame = g_skip_frame;
     g_skip_frame = (frame_count & Settings::values.frame_skip) != 0;
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 7456b019..3510c6b2 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -38,7 +38,7 @@ enum class ResultStatus {
     ErrorMemoryAllocationFailed,
 };
 
-static u32 MakeMagic(char a, char b, char c, char d) {
+static inline u32 MakeMagic(char a, char b, char c, char d) {
     return a | b << 8 | c << 16 | d << 24;
 }
 
-- 
cgit v1.2.3