From 82718c4a41d141b524026af4d70af167965e5a1c Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 20 Jun 2015 20:13:06 +0100
Subject: Common: Remove unused SSE version checking and a GCC macro.

---
 src/common/platform.h | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'src/common/platform.h')

diff --git a/src/common/platform.h b/src/common/platform.h
index df780ac6..bda3e7be 100644
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -62,28 +62,3 @@
 #elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM)
     #define EMU_ARCH_BITS 32
 #endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Feature detection
-
-#if defined _M_GENERIC
-#  define _M_SSE 0x0
-#elif defined __GNUC__
-# if defined __SSE4_2__
-#  define _M_SSE 0x402
-# elif defined __SSE4_1__
-#  define _M_SSE 0x401
-# elif defined __SSSE3__
-#  define _M_SSE 0x301
-# elif defined __SSE3__
-#  define _M_SSE 0x300
-# endif
-#elif (_MSC_VER >= 1500) || __INTEL_COMPILER // Visual Studio 2008
-#  define _M_SSE 0x402
-#endif
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Compiler-Specific Definitions
-
-#define GCC_VERSION_AVAILABLE(major, minor) (defined(__GNUC__) &&  (__GNUC__ > (major) || \
-    (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))))
-- 
cgit v1.2.3


From ce0cfd62d95cdc46f4517ad16a0396a5815cb595 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 20 Jun 2015 20:14:43 +0100
Subject: Common: Remove now-unused EMU_PLATFORM define, fixes issue #373.

---
 src/citra_qt/main.cpp |  4 ----
 src/common/platform.h | 30 ------------------------------
 2 files changed, 34 deletions(-)

(limited to 'src/common/platform.h')

diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 8041816a..43b80a34 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -18,10 +18,6 @@
 #include "common/platform.h"
 #include "common/scope_exit.h"
 
-#if EMU_PLATFORM == PLATFORM_LINUX
-#include <unistd.h>
-#endif
-
 #include "bootmanager.h"
 #include "hotkeys.h"
 
diff --git a/src/common/platform.h b/src/common/platform.h
index bda3e7be..0a912dda 100644
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -24,39 +24,9 @@
 
 #pragma once
 
-#include "common/common_types.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Platform definitions
-
-/// Enumeration for defining the supported platforms
-#define PLATFORM_NULL 0
-#define PLATFORM_WINDOWS 1
-#define PLATFORM_MACOSX 2
-#define PLATFORM_LINUX 3
-#define PLATFORM_ANDROID 4
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Platform detection
 
-#ifndef EMU_PLATFORM
-
-#if defined( __WIN32__ ) || defined( _WIN32 )
-#define EMU_PLATFORM PLATFORM_WINDOWS
-
-#elif defined( __APPLE__ ) || defined( __APPLE_CC__ )
-#define EMU_PLATFORM PLATFORM_MACOSX
-
-#elif defined(__linux__)
-#define EMU_PLATFORM PLATFORM_LINUX
-
-#else // Assume linux otherwise
-#define EMU_PLATFORM PLATFORM_LINUX
-
-#endif
-
-#endif
-
 #if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__)
     #define EMU_ARCH_BITS 64
 #elif defined(__i386) || defined(_M_IX86) || defined(__arm__) || defined(_M_ARM)
-- 
cgit v1.2.3