-- Change to make blender with game engine disabled build without errors

   on 64-bit machines.

   This code only seems to be used by the game engine anyway; maybe it's
   only linux which always compiles it regardless of whether game engine is
   enabled?

1 files changed, 13 insertions, 3 deletions

diff --git a/source/kernel/gen_system/GEN_HashedPtr.cpp b/source/kernel/gen_system/GEN_HashedPtr.cpp
index f852530fa53..4da40e6696d 100644
--- a/source/kernel/gen_system/GEN_HashedPtr.cpp
+++ b/source/kernel/gen_system/GEN_HashedPtr.cpp
@@ -36,9 +36,19 @@
 #include <config.h>
 #endif
 
-unsigned int GEN_Hash(unsigned int inDWord)
+//
+// Build hash index from pointer.  Even though the final result
+// is a 32-bit integer, use all the bits of the pointer as long
+// as possible.
+//
+
+unsigned int GEN_Hash(void * inDWord)
 {
-	unsigned int key = inDWord;
+#if defined(_WIN64)
+	unsigned __int64 key = (unsigned __int64)inDWord;
+#else
+	unsigned long key = (unsigned long)inDWord;
+#endif
 
 	key += ~(key << 16);
 	key ^=  (key >>  5);
@@ -47,5 +57,5 @@ unsigned int GEN_Hash(unsigned int inDWord)
 	key += ~(key <<  9);
 	key ^=  (key >> 17);
 
-  	return key;
+  	return (unsigned int)(key & 0xffffffff);
 }