From 8dd683f63fd3118f3cfc6e5c9742858593073bec Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Fri, 3 May 2013 16:10:23 +1000
Subject: [PATCH] Fix name collision when building on Windows. Was preventing
 Blackberry from building.

---
 Common/{Atomic.h => Atomics.h} | 0
 Common/Common.vcxproj          | 4 ++--
 Common/Common.vcxproj.filters  | 4 ++--
 Common/ConsoleListener.cpp     | 2 +-
 Common/FifoQueue.h             | 2 +-
 Core/CoreTiming.cpp            | 2 +-
 Core/MemMapFunctions.cpp       | 2 +-
 native                         | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename Common/{Atomic.h => Atomics.h} (100%)

diff --git a/Common/Atomic.h b/Common/Atomics.h
similarity index 100%
rename from Common/Atomic.h
rename to Common/Atomics.h
diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index c3c58e9b26..9b64a6462e 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -156,7 +156,7 @@
   <ItemGroup>
     <ClInclude Include="ABI.h" />
     <ClInclude Include="ArmEmitter.h" />
-    <ClInclude Include="Atomic.h" />
+    <ClInclude Include="Atomics.h" />
     <ClInclude Include="Atomic_GCC.h" />
     <ClInclude Include="Atomic_Win32.h" />
     <ClInclude Include="ChunkFile.h" />
@@ -245,4 +245,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index 24ebfe6ebd..bac166f773 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -4,7 +4,7 @@
     <ClInclude Include="targetver.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="ABI.h" />
-    <ClInclude Include="Atomic.h" />
+    <ClInclude Include="Atomics.h" />
     <ClInclude Include="Atomic_GCC.h" />
     <ClInclude Include="Atomic_Win32.h" />
     <ClInclude Include="ChunkFile.h" />
@@ -74,4 +74,4 @@
   <ItemGroup>
     <None Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp
index 59022f020a..b7a69208d5 100644
--- a/Common/ConsoleListener.cpp
+++ b/Common/ConsoleListener.cpp
@@ -30,7 +30,7 @@
 #include "Common.h"
 #include "LogManager.h" // Common
 #include "ConsoleListener.h" // Common
-#include "Atomic.h"
+#include "Atomics.h"
 
 #ifdef _WIN32
 const int LOG_PENDING_MAX = 120 * 10000;
diff --git a/Common/FifoQueue.h b/Common/FifoQueue.h
index 2060ceee92..dce6e08034 100644
--- a/Common/FifoQueue.h
+++ b/Common/FifoQueue.h
@@ -5,7 +5,7 @@
 // a simple lockless thread-safe,
 // single reader, single writer queue
 
-#include "Atomic.h"
+#include "Atomics.h"
 
 namespace Common
 {
diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp
index d6625ee736..77558817a2 100644
--- a/Core/CoreTiming.cpp
+++ b/Core/CoreTiming.cpp
@@ -21,7 +21,7 @@
 
 #include "MsgHandler.h"
 #include "StdMutex.h"
-#include "Atomic.h"
+#include "Atomics.h"
 #include "CoreTiming.h"
 #include "Core.h"
 #include "HLE/sceKernelThread.h"
diff --git a/Core/MemMapFunctions.cpp b/Core/MemMapFunctions.cpp
index df29713ffd..7858ce3bae 100644
--- a/Core/MemMapFunctions.cpp
+++ b/Core/MemMapFunctions.cpp
@@ -16,7 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "Common.h"
-#include "Atomic.h"
+#include "Atomics.h"
 
 #include "MemMap.h"
 #include "Config.h"
diff --git a/native b/native
index f9c50c822a..3edfc6ac1c 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit f9c50c822a9a12bcd3952dda58876d1fc2afa2a9
+Subproject commit 3edfc6ac1c8c9fa9481ad2a45a7ae0dc849dd9d9