Merge from trunk.

[gnu-emacs] / src / composite.h

diff --git a/src/composite.h b/src/composite.h
index 0f81911f0b02bc80a90b8513bed22e2007136dba..8cedfdbe352cf3d6149d13c8bf9de023e87d0df0 100644 (file)
--- a/src/composite.h
+++ b/src/composite.h
@@ -151,7 +151,7 @@ extern Lisp_Object composition_temp;
 /* Nonzero if the global reference point GREF and new reference point NREF are
    valid.  */
 #define COMPOSITION_ENCODE_RULE_VALID(gref, nref)      \
-  ((unsigned) (gref) < 12 && (unsigned) (nref) < 12)
+  (UNSIGNED_CMP (gref, <, 12) && UNSIGNED_CMP (nref, <, 12))
 
 /* Return encoded composition rule for the pair of global reference
    point GREF and new reference point NREF.  Arguments must be valid.  */