[Scummvm-cvs-logs] CVS: scummvm/common scummsys.h,1.28,1.29

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv9651

Modified Files:
	scummsys.h 
Log Message:
some more cleanup

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- scummsys.h	14 Jun 2003 22:42:14 -0000	1.28
+++ scummsys.h	14 Jun 2003 23:05:40 -0000	1.29
@@ -315,12 +315,12 @@
 
 #if defined(SCUMM_LITTLE_ENDIAN)
 
-	#define PROTO_MKID(a) \
-			((a >> 24) & 0x000000FF) | \
-			((a >>  8) & 0x0000FF00) | \
-			((a <<  8) & 0x00FF0000) | \
-			((a << 24) & 0xFF000000)
-	#define PROTO_MKID_BE(a) (a & 0xFFFFFFFFUL)
+	#define PROTO_MKID(a) ((uint32) \
+			(((a) >> 24) & 0x000000FF) | \
+			(((a) >>  8) & 0x0000FF00) | \
+			(((a) <<  8) & 0x00FF0000) | \
+			(((a) << 24) & 0xFF000000))
+	#define PROTO_MKID_BE(a) ((uint32)(a))
 
 	#if defined(INVERSE_MKID)
 	#  define MKID(a) PROTO_MKID_BE(a)
@@ -386,7 +386,8 @@
 
 #if defined(SCUMM_NEED_ALIGNMENT) || defined(SCUMM_LITTLE_ENDIAN)
 	FORCEINLINE uint16 READ_BE_UINT16(const void *ptr) {
-		return (((const byte *)ptr)[0] << 8)|((const byte *)ptr)[1];
+		const byte *b = (const byte *)ptr;
+		return (b[0] << 8) + b[1];
 	}
 	FORCEINLINE uint32 READ_BE_UINT32(const void *ptr) {
 		const byte *b = (const byte*)ptr;