diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2012-04-24 18:33:44 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2012-04-24 18:33:44 +0400 |
commit | 0db3c5f74300980d35b3114992c299f072b913b1 (patch) | |
tree | 46cd6f52ac700ed09afc455944ca33e6e7e0d672 /source/gameengine | |
parent | 4782522379b708f15bd5b045ca4193637c465979 (diff) |
Remove mingw-w64 errors from loss of precision by converting 64bit pointers to ints. All cases found were harmless and the error behaviour could be turned off by the -fpermissive flag but I'd rather keep that off to detect any real problems should they arise.
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, 12 insertions, 4 deletions
diff --git a/source/gameengine/Expressions/KX_HashedPtr.cpp b/source/gameengine/Expressions/KX_HashedPtr.cpp index 51550d52636..84488e3641d 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.cpp +++ b/source/gameengine/Expressions/KX_HashedPtr.cpp @@ -28,13 +28,15 @@ /** \file gameengine/Expressions/KX_HashedPtr.cpp * \ingroup expressions */ - +#ifdef __MINGW64__ +#include <basetsd.h> +#endif #include "KX_HashedPtr.h" unsigned int KX_Hash(void * inDWord) { -#if defined(_WIN64) && !defined(FREE_WINDOWS64) +#ifdef _WIN64 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 c5145ef2171..bdb586b2474 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -31,7 +31,10 @@ */ -#if defined(_WIN64) && !defined(FREE_WINDOWS64) +#if defined(_WIN64) +# ifdef __MINGW64__ +# include <basetsd.h> +# endif 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 950e3c88a9e..b8872f5ddc3 100644 --- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp +++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp @@ -31,7 +31,10 @@ */ -#if defined(_WIN64) && !defined(FREE_WINDOWS64) +#if defined(_WIN64) +# ifdef __MINGW64__ +# include <basetsd.h> +# endif typedef unsigned __int64 uint_ptr; #else typedef unsigned long uint_ptr; |