Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2012-04-24 18:33:44 +0400
committerAntony Riakiotakis <kalast@gmail.com>2012-04-24 18:33:44 +0400
commit0db3c5f74300980d35b3114992c299f072b913b1 (patch)
tree46cd6f52ac700ed09afc455944ca33e6e7e0d672 /source/gameengine/Expressions/KX_HashedPtr.cpp
parent4782522379b708f15bd5b045ca4193637c465979 (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/Expressions/KX_HashedPtr.cpp')
-rw-r--r--source/gameengine/Expressions/KX_HashedPtr.cpp6
1 files changed, 4 insertions, 2 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;