[Scummvm-cvs-logs] SF.net SVN: scummvm: [20860] scummvm/trunk/common/endian.h

[fingolfin at users.sourceforge.net]

Revision: 20860
Author:   fingolfin
Date:     2006-02-24 17:24:10 -0800 (Fri, 24 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20860&view=rev

Log Message:
-----------
Removed the (useless and confusing) PROTO_MKID_BE macro

Modified Paths:
--------------
    scummvm/trunk/common/endian.h
Modified: scummvm/trunk/common/endian.h
===================================================================
--- scummvm/trunk/common/endian.h	2006-02-25 01:18:01 UTC (rev 20859)
+++ scummvm/trunk/common/endian.h	2006-02-25 01:24:10 UTC (rev 20860)
@@ -48,14 +48,13 @@
 			(((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)
+	#  define MKID(a) ((uint32)(a))
 	#  define MKID_BE(a) PROTO_MKID(a)
 	#else
 	#  define MKID(a) PROTO_MKID(a)
-	#  define MKID_BE(a) PROTO_MKID_BE(a)
+	#  define MKID_BE(a) ((uint32)(a))
 	#endif
 
 	#define READ_UINT16(a) READ_LE_UINT16(a)
@@ -77,7 +76,6 @@
 
 	#define MKID(a) ((uint32)(a))
 	#define MKID_BE(a) ((uint32)(a))
-	//#define MKID_BE(a) SWAP_BYTES_32(a)
 
 	#define READ_UINT16(a) READ_BE_UINT16(a)
 	#define READ_UINT32(a) READ_BE_UINT32(a)