Fix some definitions for MinGW64
authorAntony Riakiotakis <kalast@gmail.com>
Fri, 19 Jul 2013 19:19:15 +0000 (19:19 +0000)
committerAntony Riakiotakis <kalast@gmail.com>
Fri, 19 Jul 2013 19:19:15 +0000 (19:19 +0000)
source/gameengine/Expressions/KX_HashedPtr.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_IPO_SGController.cpp

index 555ef7f95007178c3bea2dd8ef6e88a2b1ef8de7..bd42892cc8d90226ace304e0a30a35034aff240e 100644 (file)
@@ -36,6 +36,8 @@ unsigned int KX_Hash(void *inDWord)
 {
 #if defined(_WIN64) && !defined(FREE_WINDOWS64)
        unsigned __int64 key = (unsigned __int64)inDWord;
+#elif defined(FREE_WINDOWS64)
+       unsigned long long key = (unsigned long long)inDWord;
 #else
        unsigned long key = (unsigned long)inDWord;
 #endif
index 871318bcedcb0d6c9e744ebb4dd23d25894d72f1..ec62ae63f0c5133a600fdbaf39a663818e17cf70 100644 (file)
@@ -38,6 +38,8 @@
 
 #if defined(_WIN64) && !defined(FREE_WINDOWS64)
 typedef unsigned __int64 uint_ptr;
+#elif defined(FREE_WINDOWS64)
+typedef unsigned long long uint_ptr;
 #else
 typedef unsigned long uint_ptr;
 #endif
index 4c43633d4c5328a87dd887d0e094a8d55994d2af..f221b7c6cd48f498d11b7ffcfbe63343116fdb37 100644 (file)
@@ -33,6 +33,8 @@
 
 #if defined(_WIN64) && !defined(FREE_WINDOWS64)
 typedef unsigned __int64 uint_ptr;
+#elif defined(FREE_WINDOWS64)
+typedef unsigned long long uint_ptr;
 #else
 typedef unsigned long uint_ptr;
 #endif