Merge pull request #588 from archshift/somebranch

Sweeping cleanup of Common

1 files changed, 22 insertions, 51 deletions

diff --git a/src/common/common.h b/src/common/common.h
index ad2de6f2e..948dc536a 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -28,7 +28,6 @@ private:
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "common/common_types.h"
-#include "common/msg_handler.h"
 #include "common/common_funcs.h"
 #include "common/common_paths.h"
 #include "common/platform.h"
@@ -36,13 +35,11 @@ private:
 #ifdef __APPLE__
 // The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
 // This is only needed on i386 gcc - x86_64 already aligns to 16 bytes.
-#if defined __i386__ && defined __GNUC__
-#undef STACKALIGN
-#define STACKALIGN __attribute__((__force_align_arg_pointer__))
-#endif
-
+    #if defined __i386__ && defined __GNUC__
+        #undef STACKALIGN
+        #define STACKALIGN __attribute__((__force_align_arg_pointer__))
+    #endif
 #elif defined _WIN32
-
 // Check MSC ver
     #if defined _MSC_VER && _MSC_VER <= 1000
         #error needs at least version 1000 of MSC
@@ -52,9 +49,6 @@ private:
     #define NOMINMAX
     #endif
 
-// Memory leak checks
-    #define CHECK_HEAP_INTEGRITY()
-
 // Alignment
     #define MEMORY_ALIGNED16(x) __declspec(align(16)) x
     #define MEMORY_ALIGNED32(x) __declspec(align(32)) x
@@ -62,57 +56,34 @@ private:
     #define MEMORY_ALIGNED128(x) __declspec(align(128)) x
     #define MEMORY_ALIGNED16_DECL(x) __declspec(align(16)) x
     #define MEMORY_ALIGNED64_DECL(x) __declspec(align(64)) x
-
-// Since they are always around on windows
-    #define HAVE_WX 1
-    #define HAVE_OPENAL 1
-
-    #define HAVE_PORTAUDIO 1
-
-// Debug definitions
-    #if defined(_DEBUG)
-        #include <crtdbg.h>
-        #undef CHECK_HEAP_INTEGRITY
-        #define CHECK_HEAP_INTEGRITY() {if (!_CrtCheckMemory()) PanicAlert("memory corruption detected. see log.");}
-        // If you want to see how much a pain in the ass singletons are, for example:
-        // {614} normal block at 0x030C5310, 188 bytes long.
-        // Data: <Master Log      > 4D 61 73 74 65 72 20 4C 6F 67 00 00 00 00 00 00
-        struct CrtDebugBreak { CrtDebugBreak(int spot) { _CrtSetBreakAlloc(spot); } };
-        //CrtDebugBreak breakAt(614);
-    #endif // end DEBUG/FAST
-
 #endif
 
 // Windows compatibility
 #ifndef _WIN32
-#ifdef _LP64
-#define _M_X64 1
-#else
-#define _M_IX86 1
-#endif
-#define __forceinline inline __attribute__((always_inline))
-#define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x
-#define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x
-#define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x
-#define MEMORY_ALIGNED128(x) __attribute__((aligned(128))) x
-#define MEMORY_ALIGNED16_DECL(x) __attribute__((aligned(16))) x
-#define MEMORY_ALIGNED64_DECL(x) __attribute__((aligned(64))) x
+    #ifdef _LP64
+        #define _M_X64 1
+    #else
+        #define _M_IX86 1
+    #endif
+    #define __forceinline inline __attribute__((always_inline))
+    #define MEMORY_ALIGNED16(x) __attribute__((aligned(16))) x
+    #define MEMORY_ALIGNED32(x) __attribute__((aligned(32))) x
+    #define MEMORY_ALIGNED64(x) __attribute__((aligned(64))) x
+    #define MEMORY_ALIGNED128(x) __attribute__((aligned(128))) x
+    #define MEMORY_ALIGNED16_DECL(x) __attribute__((aligned(16))) x
+    #define MEMORY_ALIGNED64_DECL(x) __attribute__((aligned(64))) x
 #endif
 
 #ifdef _MSC_VER
-#define __strdup _strdup
-#define __getcwd _getcwd
-#define __chdir _chdir
+    #define __strdup _strdup
+    #define __getcwd _getcwd
+    #define __chdir _chdir
 #else
-#define __strdup strdup
-#define __getcwd getcwd
-#define __chdir chdir
+    #define __strdup strdup
+    #define __getcwd getcwd
+    #define __chdir chdir
 #endif
 
-// Dummy macro for marking translatable strings that can not be immediately translated.
-// wxWidgets does not have a true dummy macro for this.
-#define _trans(a) a
-
 #if defined _M_GENERIC
 #  define _M_SSE 0x0
 #elif defined __GNUC__