[Scummvm-cvs-logs] scummvm master -> 79c902338b3671e7a7e7cc855c6af0f0148e0ad8

[clone2727]

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

Summary:
db64442c4a COMMON: Fix strict-alignment READ_BE_UINT64 on LE and READ_LE_UINT64 on BE
79c902338b TEST: Use "/usr/bin/env python" as the shebang line in cxxtestgen.py


Commit: db64442c4aedd29864cb37f610dec7463ffd07a7
    https://github.com/scummvm/scummvm/commit/db64442c4aedd29864cb37f610dec7463ffd07a7
Author: clone2727 (clone2727 at Matthew-Hoopss-iMac-G4.local)
Date: 2015-01-18T14:41:15-05:00

Commit Message:
COMMON: Fix strict-alignment READ_BE_UINT64 on LE and READ_LE_UINT64 on BE

Changed paths:
    common/endian.h



diff --git a/common/endian.h b/common/endian.h
index 1c06bb9..7278265 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;


Commit: 79c902338b3671e7a7e7cc855c6af0f0148e0ad8
    https://github.com/scummvm/scummvm/commit/79c902338b3671e7a7e7cc855c6af0f0148e0ad8
Author: clone2727 (clone2727 at Matthew-Hoopss-iMac-G4.local)
Date: 2015-01-18T14:41:16-05:00

Commit Message:
TEST: Use "/usr/bin/env python" as the shebang line in cxxtestgen.py

Changed paths:
    test/cxxtest/cxxtestgen.py



diff --git a/test/cxxtest/cxxtestgen.py b/test/cxxtest/cxxtestgen.py
index 4145c3c..46267ac 100755
--- a/test/cxxtest/cxxtestgen.py
+++ b/test/cxxtest/cxxtestgen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 '''Usage: %s [OPTIONS] <input file(s)>
 Generate test source file for CxxTest.