From 6d93a6b6981cd4edfc70c884cca5592b88d9f9f1 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 23 Nov 2010 15:52:42 +0000 Subject: [PATCH] Linux build fix for the windows build fix in r6465. I tested this on both windows and linux. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6467 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp | 2 +- Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp index 35bec60a95..0c63179bc8 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp @@ -130,7 +130,7 @@ Fix profiled loads/stores to work safely. On 32-bit, one solution is to #endif #include -#include +#include #include #include #include "IR.h" diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index 1f6ae83486..e45048df49 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -193,10 +193,10 @@ namespace JitILProfiler static u64 beginTime; static Block& Add(u64 codeHash) { - const u32 blockIndex = blocks.size(); + const u32 _blockIndex = blocks.size(); blocks.push_back(Block()); Block& block = blocks.back(); - block.index = blockIndex; + block.index = _blockIndex; block.codeHash = codeHash; return block; }