diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-20 02:10:11 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-07-20 02:10:11 +0400 |
| commit | 103ef7cacb5dd10aa2dfd5bb973c0dfd772885eb (patch) | |
| tree | 8fd9a6b770998717f4555e7121fb16116b441865 /source/gameengine | |
| parent | eb21bdd249427465a093a078cda7864309a8f735 (diff) | |
| parent | 869d654cccba8b9b0bc295e7ce89e8e322912023 (diff) | |
Merged changes from trunk r58324-58419.ge_dev
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Expressions/KX_HashedPtr.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_IPO_SGController.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/source/gameengine/Expressions/KX_HashedPtr.cpp b/source/gameengine/Expressions/KX_HashedPtr.cpp index 555ef7f9500..bd42892cc8d 100644 --- a/source/gameengine/Expressions/KX_HashedPtr.cpp +++ b/source/gameengine/Expressions/KX_HashedPtr.cpp @@ -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 diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 871318bcedc..ec62ae63f0c 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -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 diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.cpp b/source/gameengine/Ketsji/KX_IPO_SGController.cpp index 4c43633d4c5..f221b7c6cd4 100644 --- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp +++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp @@ -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 |