From 5bc926e97c90472e1a88d82dd9eac3adf2c130d0 Mon Sep 17 00:00:00 2001
From: Azaezel <quillus@hotmail.com>
Date: Thu, 6 Aug 2015 21:01:20 -0500
Subject: [PATCH] warning C4005: 'WIN32' : macro redefinition

---
 Engine/source/ts/tsMeshFit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Engine/source/ts/tsMeshFit.cpp b/Engine/source/ts/tsMeshFit.cpp
index bf4225406..6d11f773a 100644
--- a/Engine/source/ts/tsMeshFit.cpp
+++ b/Engine/source/ts/tsMeshFit.cpp
@@ -28,9 +28,9 @@
 #include "console/engineAPI.h"
 
 // define macros required for ConvexDecomp headers
-#if defined( _WIN32 )
+#if defined( _WIN32 ) && !defined( WIN32 )
 #define WIN32
-#elif defined( __MACOSX__ )
+#elif defined( __MACOSX__ ) && !defined( APPLE )
 #define APPLE
 #endif