diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2012-04-24 20:14:23 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2012-04-24 20:14:23 +0400 |
| commit | 4e6590067d5c398479d0d041b3afacc26d24061d (patch) | |
| tree | 6b3bc29116a7212d4ab56367016f8b6e799b705f /source/gameengine | |
| parent | 749d284b498fb1cde7996d712497ce478c978f3a (diff) | |
revert 45924, not a very clean solution, especially for external libraries and looks like -fpermissive is used in linux too
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Expressions/KX_HashedPtr.cpp | 6 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 5 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_IPO_SGController.cpp | 5 |
3 files changed, 4 insertions, 12 deletions
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 <basetsd.h> -#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; diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index bdb586b2474..c5145ef2171 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -31,10 +31,7 @@ */ -#if defined(_WIN64) -# ifdef __MINGW64__ -# include <basetsd.h> -# endif +#if defined(_WIN64) && !defined(FREE_WINDOWS64) typedef unsigned __int64 uint_ptr; #else typedef unsigned long uint_ptr; diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.cpp b/source/gameengine/Ketsji/KX_IPO_SGController.cpp index b8872f5ddc3..950e3c88a9e 100644 --- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp +++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp @@ -31,10 +31,7 @@ */ -#if defined(_WIN64) -# ifdef __MINGW64__ -# include <basetsd.h> -# endif +#if defined(_WIN64) && !defined(FREE_WINDOWS64) typedef unsigned __int64 uint_ptr; #else typedef unsigned long uint_ptr; |