[Scummvm-cvs-logs] CVS: scummvm scummsys.h,1.39,1.40

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv5557

Modified Files:
	scummsys.h 
Log Message:
endian fixes; cleanup

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummsys.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- scummsys.h	25 Jul 2002 21:34:05 -0000	1.39
+++ scummsys.h	24 Aug 2002 23:22:10 -0000	1.40
@@ -237,6 +237,8 @@
 #endif
 
 
+#define SWAP_BYTES(a) ((((a)>>24)&0xFF) | (((a)>>8)&0xFF00) | (((a)<<8)&0xFF0000) | (((a)<<24)&0xFF000000))
+
 #if defined(SCUMM_LITTLE_ENDIAN)
 
 //#if defined(SCUMM_NEED_ALIGNMENT)
@@ -244,7 +246,7 @@
 //#endif
 
 
-#define PROTO_MKID(a) ((((a)>>24)&0xFF) | (((a)>>8)&0xFF00) | (((a)<<8)&0xFF0000) | (((a)<<24)&0xFF000000))
+#define PROTO_MKID(a) SWAP_BYTES(a)
 #define PROTO_MKID_BE(a) (a & 0xffffffff)
 
 #if defined(INVERSE_MKID)
@@ -297,7 +299,7 @@
 #define TO_LE_32(__a__) __a__
 #define TO_LE_16(__a__) __a__
 
-#define TO_BE_32(a) ((((a)>>24)&0xFF) | (((a)>>8)&0xFF00) | (((a)<<8)&0xFF0000) | (((a)<<24)&0xFF000000))
+#define TO_BE_32(a) SWAP_BYTES(a)
 
 uint16 FORCEINLINE TO_BE_16(uint16 a) { return (a>>8) | (a<<8); }
 
@@ -305,7 +307,7 @@
 
 #define MKID(a) (a)
 #define MKID_BE(a) (a)
-//#define MKID_BE(a) ((((a)>>24)&0xFF) | (((a)>>8)&0xFF00) | (((a)<<8)&0xFF0000) | (((a)<<24)&0xFF000000))
+//#define MKID_BE(a) SWAP_BYTES(a)
 
 uint32 FORCEINLINE FROM_LE_32(uint32 a) {
 	return ((a>>24)&0xFF) + ((a>>8)&0xFF00) + ((a<<8)&0xFF0000) + ((a<<24)&0xFF000000);