From 6f1a3d53d7ad2a72fe994e3a3787b334bde9bb4e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 4 Apr 2004 21:00:49 +0000 Subject: [PATCH] (SINGLE_BYTE_CHAR_P): Fix macro to avoid warnings from GCC. --- src/charset.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/charset.h b/src/charset.h index 3a4eb5cbfcc..b49ed87a3ab 100644 --- a/src/charset.h +++ b/src/charset.h @@ -216,7 +216,7 @@ extern int charset_big5_2; /* Big5 Level 2 (Chinese Traditional) */ #define MAX_CHAR (0x1F << 14) /* 1 if C is a single byte character, else 0. */ -#define SINGLE_BYTE_CHAR_P(c) ((unsigned) (c) < 0x100) +#define SINGLE_BYTE_CHAR_P(c) (((unsigned)(c) & 0xFF) == (c)) /* 1 if BYTE is an ASCII character in itself, in multibyte mode. */ #define ASCII_BYTE_P(byte) ((byte) < 0x80) @@ -535,7 +535,7 @@ extern int iso_charset_table[2][2][128]; #define CHAR_STRING(c, str) \ (SINGLE_BYTE_CHAR_P (c) \ - ? ((ASCII_BYTE_P (c) || c >= 0xA0) \ + ? ((ASCII_BYTE_P (c) || c >= 0xA0) \ ? (*(str) = (unsigned char)(c), 1) \ : (*(str) = LEADING_CODE_8_BIT_CONTROL, *((str)+ 1) = c + 0x20, 2)) \ : char_to_string (c, (unsigned char *) str))