diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2356a6eb04..bab23e50dd4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-21  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* system.h (IN_RANGE): Cast each argument individually.
+
 2007-10-21  Richard Sandiford  <rsandifo@nildram.co.uk>
 
 	* config/mips/mips.c (mips_set_mips16_mode) Say sorry for hard-float
diff --git a/gcc/system.h b/gcc/system.h
index 1696b9c92b4..65f27379ad1 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -253,7 +253,8 @@ extern int errno;
    UPPER.  However the bounds themselves can be either positive or
    negative.  */
 #define IN_RANGE(VALUE, LOWER, UPPER) \
-  ((unsigned HOST_WIDE_INT)((VALUE) - (LOWER)) <= ((UPPER) - (LOWER)))
+  ((unsigned HOST_WIDE_INT) (VALUE) - (unsigned HOST_WIDE_INT) (LOWER) \
+   <= (unsigned HOST_WIDE_INT) (UPPER) - (unsigned HOST_WIDE_INT) (LOWER))
 
 /* Infrastructure for defining missing _MAX and _MIN macros.  Note that
    macros defined with these cannot be used in #if.  */