diff options
| author | Max Horn | 2006-02-25 01:24:10 +0000 |
|---|---|---|
| committer | Max Horn | 2006-02-25 01:24:10 +0000 |
| commit | 6931478e9180a23f9da02790ed2dd3ff503d3b2e (patch) | |
| tree | cb6e58507655089be48c1c7a818a3e6164b843e8 | |
| parent | a30f82977349d0cecc83eac2166e1a6be2553fae (diff) | |
| download | scummvm-rg350-6931478e9180a23f9da02790ed2dd3ff503d3b2e.tar.gz scummvm-rg350-6931478e9180a23f9da02790ed2dd3ff503d3b2e.tar.bz2 scummvm-rg350-6931478e9180a23f9da02790ed2dd3ff503d3b2e.zip | |
Removed the (useless and confusing) PROTO_MKID_BE macro
svn-id: r20860
| -rw-r--r-- | common/endian.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/common/endian.h b/common/endian.h index 489cfb9f6b..4e1f46c026 100644 --- a/common/endian.h +++ b/common/endian.h @@ -48,14 +48,13 @@ FORCEINLINE uint16 SWAP_BYTES_16(uint16 a) { (((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 @@ FORCEINLINE uint16 SWAP_BYTES_16(uint16 a) { #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) |