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/Ketsji/KX_GameObject.cpp | |
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/Ketsji/KX_GameObject.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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; |