[Scummvm-cvs-logs] CVS: tools util.h,1.14,1.15

[Max Horn]

Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28402

Modified Files:
	util.h 
Log Message:
cleanup

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/tools/util.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- util.h	13 Apr 2004 19:29:41 -0000	1.14
+++ util.h	22 Sep 2004 20:30:12 -0000	1.15
@@ -69,12 +69,12 @@
 #define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0])))
 
 static inline uint32 SWAP_32(uint32 a) {
-	return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + ((a << 8) & 0xFF0000) +
+	return ((a >> 24) & 0xFF) | ((a >> 8) & 0xFF00) | ((a << 8) & 0xFF0000) |
 		((a << 24) & 0xFF000000);
 }
 
 static inline uint16 SWAP_16(uint16 a) {
-	return ((a >> 8) & 0xFF) + ((a << 8) & 0xFF00);
+	return ((a >> 8) & 0xFF) | ((a << 8) & 0xFF00);
 }
 
 #if defined(SCUMM_BIG_ENDIAN)