metacity r4038 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Tue Nov 25 23:18:08 2008
New Revision: 4038
URL: http://svn.gnome.org/viewvc/metacity?rev=4038&view=rev

Log:
	* src/core/xprops.c: add casts (#562106)



Modified:
   trunk/ChangeLog
   trunk/src/core/xprops.c

Modified: trunk/src/core/xprops.c
==============================================================================
--- trunk/src/core/xprops.c	(original)
+++ trunk/src/core/xprops.c	Tue Nov 25 23:18:08 2008
@@ -673,9 +673,9 @@
 /* From Xmd.h */
 #ifndef cvtINT32toInt
 #if SIZEOF_VOID_P == 8
-#define cvtINT8toInt(val)   (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val))
-#define cvtINT16toInt(val)  (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val))
-#define cvtINT32toInt(val)  (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (val))
+#define cvtINT8toInt(val)   ((((unsigned int)val) & 0x00000080) ? (((unsigned int)val) | 0xffffffffffffff00) : ((unsigned int)val))
+#define cvtINT16toInt(val)  ((((unsigned int)val) & 0x00008000) ? (((unsigned int)val) | 0xffffffffffff0000) : ((unsigned int)val))
+#define cvtINT32toInt(val)  ((((unsigned int)val) & 0x80000000) ? (((unsigned int)val) | 0xffffffff00000000) : ((unsigned int)val))
 #define cvtINT8toShort(val)  cvtINT8toInt(val)
 #define cvtINT16toShort(val) cvtINT16toInt(val)
 #define cvtINT32toShort(val) cvtINT32toInt(val)