]> git.proxmox.com Git - qemu.git/commitdiff
json-lexer: fix conflict with mingw32 ERROR definition
authorBlue Swirl <blauwirbel@gmail.com>
Sun, 27 Mar 2011 09:07:54 +0000 (09:07 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Fri, 15 Apr 2011 18:25:38 +0000 (18:25 +0000)
The name ERROR is too generic, it conflicts with mingw32 ERROR definition.

Replace ERROR with IN_ERROR.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
json-lexer.c

index c736f42900e9484a33327cf79ac094ef99e86a66..65c9720d65be3eafcf7cfec6ec9141520c1a846b 100644 (file)
@@ -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;