From 4e6590067d5c398479d0d041b3afacc26d24061d Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 24 Apr 2012 16:14:23 +0000 Subject: revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too --- source/gameengine/Expressions/KX_HashedPtr.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/gameengine/Expressions') diff --git a/source/gameengine/Expressions/KX_HashedPtr.cpp b/source/gameengine/Expressions/KX_HashedPtr.cpp index 84488e3641d..51550d52636 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.cpp +++ b/source/gameengine/Expressions/KX_HashedPtr.cpp @@ -28,15 +28,13 @@ /** \file gameengine/Expressions/KX_HashedPtr.cpp * \ingroup expressions */ -#ifdef __MINGW64__ -#include -#endif + #include "KX_HashedPtr.h" unsigned int KX_Hash(void * inDWord) { -#ifdef _WIN64 +#if defined(_WIN64) && !defined(FREE_WINDOWS64) unsigned __int64 key = (unsigned __int64)inDWord; #else unsigned long key = (unsigned long)inDWord; -- cgit v1.2.3