[Scummvm-cvs-logs] scummvm master -> cc045f7a83b1282ee453d0c1d90ca2372de554c8

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cc045f7a83 COMMON: Fix strict-alignment READ_UINT64


Commit: cc045f7a83b1282ee453d0c1d90ca2372de554c8
    https://github.com/scummvm/scummvm/commit/cc045f7a83b1282ee453d0c1d90ca2372de554c8
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-01-14T23:20:33+01:00

Commit Message:
COMMON: Fix strict-alignment READ_UINT64

Changed paths:
    common/endian.h



diff --git a/common/endian.h b/common/endian.h
index 0c6b3db..1c06bb9 100644
--- a/common/endian.h
+++ b/common/endian.h
@@ -322,7 +322,7 @@
 #ifdef HAVE_INT64
 		inline uint64 READ_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_UINT64(void *ptr, uint64 value) {
 			uint8 *b = (uint8 *)ptr;
@@ -362,7 +362,7 @@
 #ifdef HAVE_INT64
 		inline uint64 READ_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_UINT64(void *ptr, uint64 value) {
 			uint8 *b = (uint8 *)ptr;