[Scummvm-cvs-logs] CVS: residual bits.h,1.8,1.9

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1:/tmp/cvs-serv28605

Modified Files:
	bits.h 
Log Message:
synced

Index: bits.h
===================================================================
RCS file: /cvsroot/scummvm/residual/bits.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bits.h	12 Dec 2003 21:17:31 -0000	1.8
+++ bits.h	18 Dec 2003 08:58:57 -0000	1.9
@@ -42,8 +42,6 @@
 
 #if defined(_MSC_VER)
 
-	#define scumm_stricmp stricmp
-	#define scumm_strnicmp strnicmp
 	#define snprintf _snprintf
 
 	#if defined(CHECK_HEAP)
@@ -240,19 +238,19 @@
 
 	#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(SYSTEM_BIG_ENDIAN)
 
-	#define MKID(a) (a)
-	#define MKID_BE(a) (a)
+	#define MKID(a) ((uint32)(a))
+	#define MKID_BE(a) ((uint32)(a))
 
 	#define READ_UINT32(a) READ_BE_UINT32(a)
 
@@ -262,8 +260,8 @@
 	#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