summaryrefslogtreecommitdiff
path: root/src/basic/json.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/basic/json.c')
-rw-r--r--src/basic/json.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/json.c b/src/basic/json.c
index 1523e9fb09..3a3d1ad1e1 100644
--- a/src/basic/json.c
+++ b/src/basic/json.c
@@ -322,7 +322,7 @@ static int json_parse_string(const char **p, char **ret) {
else if (*c == 't')
ch = '\t';
else if (*c == 'u') {
- uint16_t x;
+ char16_t x;
int r;
r = unhex_ucs2(c + 1, &x);
@@ -335,11 +335,11 @@ static int json_parse_string(const char **p, char **ret) {
return -ENOMEM;
if (!utf16_is_surrogate(x))
- n += utf8_encode_unichar(s + n, x);
+ n += utf8_encode_unichar(s + n, (char32_t) x);
else if (utf16_is_trailing_surrogate(x))
return -EINVAL;
else {
- uint16_t y;
+ char16_t y;
if (c[0] != '\\' || c[1] != 'u')
return -EINVAL;