diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 20:15:59 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 20:15:59 +0200 |
| commit | 19588572258d3c3216e93ee1c9db7e28c6007e20 (patch) | |
| tree | 3e02a8f8a30c52fc6f73ec1c7f3cabee0b7ef65a /ext/json/JSON_parser.c | |
| parent | 7c7767853b12653bf13d0d17ae1a77140631342b (diff) | |
| download | php-git-19588572258d3c3216e93ee1c9db7e28c6007e20.tar.gz | |
ported ext/json
Diffstat (limited to 'ext/json/JSON_parser.c')
| -rw-r--r-- | ext/json/JSON_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/JSON_parser.c b/ext/json/JSON_parser.c index a4e34b07bc..f2a1ee4dda 100644 --- a/ext/json/JSON_parser.c +++ b/ext/json/JSON_parser.c @@ -373,7 +373,7 @@ static void utf16_to_utf8(smart_str *buf, unsigned short utf16) && ((unsigned char) buf->s->val[buf->s->len - 1] & 0xc0) == 0x80) { /* found surrogate pair */ - unsigned long utf32; + php_uint_t utf32; utf32 = (((buf->s->val[buf->s->len - 2] & 0xf) << 16) | ((buf->s->val[buf->s->len - 1] & 0x3f) << 10) |