json-lexer.c, json-parser.c: minor integrate
Change-Id: Id7a703f5c93c9a9cbd47a5f44bfdf900080e7430
diff --git a/json-lexer.c b/json-lexer.c
index 534fcf7..65c9720 100644
--- a/json-lexer.c
+++ b/json-lexer.c
@@ -27,12 +27,8 @@
*
*/
-/* 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 {
- ERROR = 0,
+ IN_ERROR = 0,
IN_DQ_UCODE3,
IN_DQ_UCODE2,
IN_DQ_UCODE1,
@@ -154,7 +150,7 @@
/* Zero */
[IN_ZERO] = {
TERMINAL(JSON_INTEGER),
- ['0' ... '9'] = ERROR,
+ ['0' ... '9'] = IN_ERROR,
['.'] = IN_MANTISSA,
},
@@ -306,7 +302,7 @@
lexer->token = qstring_new();
new_state = IN_START;
break;
- case ERROR:
+ case IN_ERROR:
return -EINVAL;
default:
break;