diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-05-10 23:26:01 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-05-11 17:56:30 -0700 |
| commit | 9251866320b5f8329a043bb56b3a794f78d12849 (patch) | |
| tree | ca005574fbc5833f93d55ce72881780aa7e78aaf /json-parser.c | |
| parent | 1da50d3beb2a75f619fa56278cb195703361e261 (diff) | |
| download | external_qemu-9251866320b5f8329a043bb56b3a794f78d12849.zip external_qemu-9251866320b5f8329a043bb56b3a794f78d12849.tar.gz external_qemu-9251866320b5f8329a043bb56b3a794f78d12849.tar.bz2 | |
Upstream: integrate various misc. minor changes
Change-Id: I7d3eca1350f980d93f9f3198fa5250fb776de729
Diffstat (limited to 'json-parser.c')
| -rw-r--r-- | json-parser.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/json-parser.c b/json-parser.c index e04932f..f3debcb 100644 --- a/json-parser.c +++ b/json-parser.c @@ -474,7 +474,8 @@ static QObject *parse_escape(JSONParserContext *ctxt, QList **tokens, va_list *a obj = QOBJECT(qint_from_int(va_arg(*ap, int))); } else if (token_is_escape(token, "%ld")) { obj = QOBJECT(qint_from_int(va_arg(*ap, long))); - } else if (token_is_escape(token, "%lld")) { + } else if (token_is_escape(token, "%lld") || + token_is_escape(token, "%I64d")) { obj = QOBJECT(qint_from_int(va_arg(*ap, long long))); } else if (token_is_escape(token, "%s")) { obj = QOBJECT(qstring_from_str(va_arg(*ap, const char *))); |