summaryrefslogtreecommitdiff
path: root/src/basic/json.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-02 11:21:25 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-02 11:21:25 +0100
commitdcd12626734ce81e89c74515eaca601ef9edf785 (patch)
tree8c9b6eec38d5ee62148db6ce62d5ae1561da0b2b /src/basic/json.c
parent6b61ae72fae00a94ebd36bee402c5a84c6aba14b (diff)
Revert "utf8.[ch]: use char32_t and char16_t instead of int, int32_t, int16_t"
Diffstat (limited to 'src/basic/json.c')
-rw-r--r--src/basic/json.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/json.c b/src/basic/json.c
index a22bc865a7..716705e5ff 100644
--- a/src/basic/json.c
+++ b/src/basic/json.c
@@ -319,7 +319,7 @@ static int json_parse_string(const char **p, char **ret) {
else if (*c == 't')
ch = '\t';
else if (*c == 'u') {
- char16_t x;
+ uint16_t x;
int r;
r = unhex_ucs2(c + 1, &x);
@@ -332,7 +332,7 @@ static int json_parse_string(const char **p, char **ret) {
return -ENOMEM;
if (!utf16_is_surrogate(x))
- n += utf8_encode_unichar(s + n, (char32_t) x);
+ n += utf8_encode_unichar(s + n, x);
else if (utf16_is_trailing_surrogate(x))
return -EINVAL;
else {