From 4c684fb274ddf6396b5d5e4c18e3120c7d8fe31e Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 16 Mar 2015 02:22:19 +0100
Subject: [PATCH 1/2] Common: Make a #else more apparent.

---
 src/common/platform.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/common/platform.h b/src/common/platform.h
index ba1109c9f..e27d6e31f 100644
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -83,7 +83,7 @@ inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
 }
 #endif
 
-#else
+#else // EMU_PLATFORM != PLATFORM_WINDOWS
 
 #define EMU_FASTCALL __attribute__((fastcall))
 #define __stdcall
@@ -92,10 +92,6 @@ inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
 #define BOOL bool
 #define DWORD u32
 
-#endif
-
-#if EMU_PLATFORM != PLATFORM_WINDOWS
-
 // TODO: Hacks..
 #include <limits.h>
 

From 188b4195867e5fcc2ed9f63fa6b10485fd15164f Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Mon, 16 Mar 2015 02:22:59 +0100
Subject: [PATCH 2/2] Common: Fix logic for setting EMU_DATA_DIR.

---
 src/common/common_paths.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/common/common_paths.h b/src/common/common_paths.h
index eb43d589f..440b06060 100644
--- a/src/common/common_paths.h
+++ b/src/common/common_paths.h
@@ -17,13 +17,12 @@
 
 // The user data dir
 #define ROOT_DIR "."
-#ifdef _WIN32
-    #define USERDATA_DIR "user"
-    #define EMU_DATA_DIR "Citra Emulator"
+#define USERDATA_DIR "user"
+#ifdef USER_DIR
+    #define EMU_DATA_DIR USER_DIR
 #else
-    #define USERDATA_DIR "user"
-    #ifdef USER_DIR
-        #define EMU_DATA_DIR USER_DIR
+    #ifdef _WIN32
+        #define EMU_DATA_DIR "Citra Emulator"
     #else
         #define EMU_DATA_DIR "citra-emu"
     #endif