Merge branch 'david-loffredo-win64-cast-warnings' (#310)

This commit is contained in:
Sebastian Pipping 2019-08-17 18:02:26 +02:00
commit 0b613819d5
2 changed files with 3 additions and 2 deletions

View file

@ -30,7 +30,8 @@ Release x.x.x xxx xxx xx xxxx
unofficial API function SystemFunction036 (RtlGenRandom)
by using official API function rand_s (needs WinXP+)
#14 Drop an OpenVMS support leftover
#235 #268 #270 Address compiler warnings
#235 #268 ..
#270 #310 Address compiler warnings
#282 #283 ..
#284 #285 Address cppcheck warnings
#294 #295 Address Clang Static Analyzer warnings

View file

@ -655,7 +655,7 @@ unicode_byte_type(char hi, char lo) {
return XML_CONVERT_INPUT_INCOMPLETE; \
} \
plane = (((hi & 0x3) << 2) | ((lo >> 6) & 0x3)) + 1; \
*(*toP)++ = ((plane >> 2) | UTF8_cval4); \
*(*toP)++ = (char)((plane >> 2) | UTF8_cval4); \
*(*toP)++ = (((lo >> 2) & 0xF) | ((plane & 0x3) << 4) | 0x80); \
from += 2; \
lo2 = GET_LO(from); \