From fc08eb4a4bfd173791b54c5d1cb51ab84849c032 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Mon, 5 Mar 2012 17:44:30 -0500 Subject: [PATCH 63/98] json-lexer: fix conflict with mingw32 ERROR definition The name ERROR is too generic, it conflicts with mingw32 ERROR definition. Replace ERROR with IN_ERROR. Signed-off-by: Blue Swirl (cherry picked from commit 33d05394a6f5e7923bc115faf5122b7f38b0418a) Signed-off-by: Jeff Cody Signed-off-by: Michal Novotny --- json-lexer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/json-lexer.c b/json-lexer.c index c736f42..65c9720 100644 --- a/json-lexer.c +++ b/json-lexer.c @@ -28,7 +28,7 @@ */ enum json_lexer_state { - ERROR = 0, + IN_ERROR = 0, IN_DQ_UCODE3, IN_DQ_UCODE2, IN_DQ_UCODE1, @@ -150,7 +150,7 @@ static const uint8_t json_lexer[][256] = { /* Zero */ [IN_ZERO] = { TERMINAL(JSON_INTEGER), - ['0' ... '9'] = ERROR, + ['0' ... '9'] = IN_ERROR, ['.'] = IN_MANTISSA, }, @@ -302,7 +302,7 @@ static int json_lexer_feed_char(JSONLexer *lexer, char ch) lexer->token = qstring_new(); new_state = IN_START; break; - case ERROR: + case IN_ERROR: return -EINVAL; default: break; -- 1.7.7.6