summaryrefslogtreecommitdiff
path: root/src/composite.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-06-12 16:25:12 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-06-12 16:25:12 -0700
commitea204efb8a3e81a4d9b04d2a36cb8c2a1c74662c (patch)
treeb209feeebf1bdb6994f46217e29ba860dcc6c7ba /src/composite.h
parent78cf1fe8a256ffc91533b43eb851bf4519e9fbcc (diff)
downloademacs-ea204efb8a3e81a4d9b04d2a36cb8c2a1c74662c.tar.gz
* lisp.h (UNSIGNED_CMP): New macro.
This fixes comparison bugs on 64-bit hosts. (ASCII_CHAR_P): Use it. * casefiddle.c (casify_object): * character.h (ASCII_BYTE_P, CHAR_VALID_P): (SINGLE_BYTE_CHAR_P, CHAR_STRING): * composite.h (COMPOSITION_ENCODE_RULE_VALID): * dispextern.h (FACE_FROM_ID): * keyboard.c (read_char): Use UNSIGNED_CMP.
Diffstat (limited to 'src/composite.h')
-rw-r--r--src/composite.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/composite.h b/src/composite.h
index 0f81911f0b0..8cedfdbe352 100644
--- 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. */