for (p = linebuffer, i = 0; i < len; i++) {
unsigned long ch = widebuf[i];
- if ((ch & 0xF800) == 0xD800) {
+ if (IS_SURROGATE(ch)) {
#ifdef PLATFORM_IS_UTF16
if (i+1 < len) {
unsigned long ch2 = widebuf[i+1];
- if ((ch & 0xFC00) == 0xD800 &&
- (ch2 & 0xFC00) == 0xDC00) {
- ch = 0x10000 + ((ch & 0x3FF) << 10) + (ch2 & 0x3FF);
+ if (IS_SURROGATE_PAIR(ch, ch2)) {
+ ch = FROM_SURROGATES(ch, ch2);
i++;
}
} else