From 1cea2fb59edca80938ae42c2b8c2af0aba8016b4 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Wed, 22 Dec 2010 17:38:44 +0100 Subject: upstream: minor json-lexer.c integration. Change-Id: Ia949694386f79c763ac4f001924a9e3cca754933 Note: Keep our fix for mingw builds. --- json-lexer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'json-lexer.c') diff --git a/json-lexer.c b/json-lexer.c index 072ae56..534fcf7 100644 --- a/json-lexer.c +++ b/json-lexer.c @@ -27,8 +27,12 @@ * */ +/* Building with mingw results in an error because ERROR is defined as a + * macro in this environment. Undefined it */ +#undef ERROR + enum json_lexer_state { - JSON_ERROR = 0, + ERROR = 0, IN_DQ_UCODE3, IN_DQ_UCODE2, IN_DQ_UCODE1, @@ -150,7 +154,7 @@ static const uint8_t json_lexer[][256] = { /* Zero */ [IN_ZERO] = { TERMINAL(JSON_INTEGER), - ['0' ... '9'] = JSON_ERROR, + ['0' ... '9'] = ERROR, ['.'] = IN_MANTISSA, }, @@ -302,7 +306,7 @@ static int json_lexer_feed_char(JSONLexer *lexer, char ch) lexer->token = qstring_new(); new_state = IN_START; break; - case JSON_ERROR: + case ERROR: return -EINVAL; default: break; -- cgit v1.1