diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-02 11:31:10 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-02 11:31:10 +0100 |
| commit | 117b94060da6ec4bacbc2319264bb0f921ce7bf1 (patch) | |
| tree | 71b9701b5a4732c29ee2d6c1f87b9aba99a2c630 /src/basic/json.c | |
| parent | 85e3351f79dc984239c1861377c22eb7c86011f2 (diff) | |
| parent | dcd12626734ce81e89c74515eaca601ef9edf785 (diff) | |
Merge pull request #1750 from systemd/revert-1740-master
Revert "utf8.[ch]: use char32_t and char16_t instead of int, int32_t,…
Diffstat (limited to 'src/basic/json.c')
| -rw-r--r-- | src/basic/json.c | 4 |
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 { |