diff options
| author | clone2727 | 2015-01-18 12:50:53 -0500 |
|---|---|---|
| committer | clone2727 | 2015-01-18 14:41:15 -0500 |
| commit | db64442c4aedd29864cb37f610dec7463ffd07a7 (patch) | |
| tree | 67ffaa674a134ff7634c4e9ba309607c0718cf02 | |
| parent | 3f66f28624812910834600d8a2cecb084dedea9f (diff) | |
| download | scummvm-rg350-db64442c4aedd29864cb37f610dec7463ffd07a7.tar.gz scummvm-rg350-db64442c4aedd29864cb37f610dec7463ffd07a7.tar.bz2 scummvm-rg350-db64442c4aedd29864cb37f610dec7463ffd07a7.zip | |
COMMON: Fix strict-alignment READ_BE_UINT64 on LE and READ_LE_UINT64 on BE
| -rw-r--r-- | common/endian.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/endian.h b/common/endian.h index 1c06bb91d3..7278265961 100644 --- a/common/endian.h +++ b/common/endian.h @@ -446,7 +446,7 @@ #ifdef HAVE_INT64 inline uint64 READ_BE_UINT64(const void *ptr) { const uint8 *b = (const uint8 *)ptr; - return (b[0] << 56) | (b[1] << 48) | (b[2] << 40) | (b[3] << 32) | (b[4] << 24) | (b[5] << 16) | (b[6] << 8) | (b[7]); + return ((uint64)b[0] << 56) | ((uint64)b[1] << 48) | ((uint64)b[2] << 40) | ((uint64)b[3] << 32) | ((uint64)b[4] << 24) | ((uint64)b[5] << 16) | ((uint64)b[6] << 8) | ((uint64)b[7]); } inline void WRITE_BE_UINT64(void *ptr, uint64 value) { uint8 *b = (uint8 *)ptr; @@ -550,7 +550,7 @@ #ifdef HAVE_INT64 inline uint64 READ_LE_UINT64(const void *ptr) { const uint8 *b = (const uint8 *)ptr; - return (b[7] << 56) | (b[6] << 48) | (b[5] << 40) | (b[4] << 32) | (b[3] << 24) | (b[2] << 16) | (b[1] << 8) | (b[0]); + return ((uint64)b[7] << 56) | ((uint64)b[6] << 48) | ((uint64)b[5] << 40) | ((uint64)b[4] << 32) | ((uint64)b[3] << 24) | ((uint64)b[2] << 16) | ((uint64)b[1] << 8) | ((uint64)b[0]); } inline void WRITE_LE_UINT64(void *ptr, uint64 value) { uint8 *b = (uint8 *)ptr; |