aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/scummsys.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/common/scummsys.h b/common/scummsys.h
index 0c520b09c1..74d470f95d 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -306,19 +306,19 @@ FORCEINLINE uint16 SWAP_BYTES_16(uint16 a) {
#define READ_UINT32(a) READ_LE_UINT32(a)
- #define FROM_LE_32(a) (a)
- #define FROM_LE_16(a) (a)
+ #define FROM_LE_32(a) ((uint32)(a))
+ #define FROM_LE_16(a) ((uint16)(a))
- #define TO_LE_32(a) (a)
- #define TO_LE_16(a) (a)
+ #define TO_LE_32(a) ((uint32)(a))
+ #define TO_LE_16(a) ((uint16)(a))
#define TO_BE_32(a) SWAP_BYTES_32(a)
#define TO_BE_16(a) SWAP_BYTES_16(a)
#elif defined(SCUMM_BIG_ENDIAN)
- #define MKID(a) (a)
- #define MKID_BE(a) (a)
+ #define MKID(a) ((uint32)(a))
+ #define MKID_BE(a) ((uint32)(a))
//#define MKID_BE(a) SWAP_BYTES_32(a)
#define READ_UINT32(a) READ_BE_UINT32(a)
@@ -329,8 +329,8 @@ FORCEINLINE uint16 SWAP_BYTES_16(uint16 a) {
#define TO_LE_32(a) SWAP_BYTES_32(a)
#define TO_LE_16(a) SWAP_BYTES_16(a)
- #define TO_BE_32(a) (a)
- #define TO_BE_16(a) (a)
+ #define TO_BE_32(a) ((uint32)(a))
+ #define TO_BE_16(a) ((uint16)(a))
#else