From c7ae1fd402c645d15d404a950ebc3167ffb09fe8 Mon Sep 17 00:00:00 2001
From: "fires.gc" <fires.gc@gmail.com>
Date: Sat, 4 Oct 2008 17:26:12 +0000
Subject: Reverted r762 and r763 - i don't see any good reason to keep this
 revision as long as nobody fixes the windows build (btw: i don't understand
 why we need a non-WX build at all). if someone is going to fix it he can
 revert this revision.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@766 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Common/Src/Common.h | 83 ++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 42 deletions(-)

(limited to 'Source/Core/Common')

diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index e64e3932f5..43ca8d25e1 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -24,16 +24,15 @@
 #define CHECK_HEAP_INTEGRITY()
 
 #ifdef _WIN32
-	#define USE_WX // Always define in Windows since it isn't tested.
-	#ifdef _DEBUG
-		#include <crtdbg.h>
-		#undef CHECK_HEAP_INTEGRITY
-		#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
-	#endif
-
-	#include "../../../PluginSpecs/CommonTypes.h"
+#ifdef _DEBUG
+#include <crtdbg.h>
+#undef CHECK_HEAP_INTEGRITY
+#define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
+#endif
+
+#include "../../../PluginSpecs/CommonTypes.h"
 #else
-	#include "CommonTypes.h"
+#include "CommonTypes.h"
 #endif
 
 #include <stdlib.h>
@@ -42,45 +41,45 @@
 
 // Function Cross-Compatibility
 #ifdef _WIN32
-	#define strcasecmp _stricmp
-	#define unlink _unlink
+#define strcasecmp _stricmp
+#define unlink _unlink
 #else
-	#define _stricmp strcasecmp
-	#define _unlink unlink
+#define _stricmp strcasecmp
+#define _unlink unlink
 #endif
 
 #ifdef _WIN32
-	#ifdef _WIN32
-		#define fseek _fseeki64
-		#define ftell _ftelli64
-	#endif
-
-	#define POSIX 0
-	#define NOMINMAX
-
-	#if _M_IX86
-		#define Crash() {__asm int 3}
-	#else
-		#if _MSC_VER > 1000
-			extern "C" {
-				__declspec(dllimport) void __stdcall DebugBreak(void);
-			}
-			#define Crash() {DebugBreak();}
-		#else
-			#error fixme
-		#endif
-	#endif
+#ifdef _WIN32
+#define fseek _fseeki64
+#define ftell _ftelli64
+#endif
+
+#define POSIX 0
+#define NOMINMAX
+
+#if _M_IX86
+#define Crash() {__asm int 3}
+#else
+#if _MSC_VER > 1000
+extern "C" {
+	__declspec(dllimport) void __stdcall DebugBreak(void);
+}
+#define Crash() {DebugBreak();}
+#else
+#error fixme
+#endif
+#endif
 
 #elif __GNUC__
-	#define POSIX 1
-	#define MAX_PATH 260
-	#define stricmp strcasecmp
-	#define Crash() {asm ("int $3");}
-	#ifdef _LP64
-		#define _M_X64 1
-	#else
-		#define _M_IX86 1
-	#endif
+#define POSIX 1
+#define MAX_PATH 260
+#define stricmp strcasecmp
+#define Crash() {asm ("int $3");}
+#ifdef _LP64
+#define _M_X64 1
+#else
+#define _M_IX86 1
+#endif
 #endif
 
 // Alignment
-- 
cgit v1.2.3