diff options
| author | Bastien Bouclet | 2017-09-24 19:06:17 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2017-09-30 21:35:16 +0200 |
| commit | 55f46d36671b1ceb23b06a7ce00627379352f9ca (patch) | |
| tree | 9df4205bf5a59258f437d1658c14b19c3726ab82 /engines/fullpipe | |
| parent | 9db2953ca38b391470019ed427070ed425cc5084 (diff) | |
| download | scummvm-rg350-55f46d36671b1ceb23b06a7ce00627379352f9ca.tar.gz scummvm-rg350-55f46d36671b1ceb23b06a7ce00627379352f9ca.tar.bz2 scummvm-rg350-55f46d36671b1ceb23b06a7ce00627379352f9ca.zip | |
BUILD: Define pointer sized integer types and remove SCUMM_64BITS
Diffstat (limited to 'engines/fullpipe')
| -rw-r--r-- | engines/fullpipe/utils.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/fullpipe/utils.h b/engines/fullpipe/utils.h index bb8c9651da..e53db3d26a 100644 --- a/engines/fullpipe/utils.h +++ b/engines/fullpipe/utils.h @@ -38,12 +38,8 @@ struct Pointer_EqualTo { struct Pointer_Hash { uint operator()(const void *x) const { -#ifdef SCUMM_64BITS - uint64 v = (uint64)x; - return (v >> 32) ^ (v & 0xffffffff); -#else - return (uint)x; -#endif + uint x = static_cast<uint>(reinterpret_cast<uintptr>(v)); + return x + (x >> 3); } }; |