From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57988 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q8IXf-0008Jf-8u for qemu-devel@nongnu.org; Fri, 08 Apr 2011 16:44:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q8IXe-0007GW-1D for qemu-devel@nongnu.org; Fri, 08 Apr 2011 16:44:30 -0400 Received: from mail-vw0-f45.google.com ([209.85.212.45]:57010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q8IXd-0007GS-TM for qemu-devel@nongnu.org; Fri, 08 Apr 2011 16:44:29 -0400 Received: by vws17 with SMTP id 17so3459316vws.4 for ; Fri, 08 Apr 2011 13:44:29 -0700 (PDT) MIME-Version: 1.0 From: Blue Swirl Date: Fri, 8 Apr 2011 23:44:09 +0300 Message-ID: Content-Type: multipart/mixed; boundary=20cf307f38b8d4196d04a06e4a75 Subject: [Qemu-devel] [PATCH 01/11] json-lexer: fix conflict with mingw32 ERROR definition List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , Anthony Liguori , Stefan Weil --20cf307f38b8d4196d04a06e4a75 Content-Type: text/plain; charset=UTF-8 The name ERROR is too generic, it conflicts with mingw32 ERROR definition. Replace ERROR with IN_ERROR. Signed-off-by: Blue Swirl --- 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.2.5 --20cf307f38b8d4196d04a06e4a75 Content-Type: text/x-diff; charset=US-ASCII; name="0001-json-lexer-fix-conflict-with-mingw32-ERROR-definitio.patch" Content-Disposition: attachment; filename="0001-json-lexer-fix-conflict-with-mingw32-ERROR-definitio.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gm9l2ioy0 RnJvbSA2YTE3NDhjNTg3ZDM0YjBjZTM3NDg4NTk2YzY4YzRhZWU1OGE0NjM4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlkOiA8NmExNzQ4YzU4N2QzNGIwY2UzNzQ4ODU5NmM2OGM0 YWVlNThhNDYzOC4xMzAyMjk1NDE4LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNvbT4KRnJvbTogQmx1 ZSBTd2lybCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+CkRhdGU6IFN1biwgMjcgTWFyIDIwMTEgMDk6 MDc6NTQgKzAwMDAKU3ViamVjdDogW1BBVENIIDAxLzExXSBqc29uLWxleGVyOiBmaXggY29uZmxp Y3Qgd2l0aCBtaW5ndzMyIEVSUk9SIGRlZmluaXRpb24KClRoZSBuYW1lIEVSUk9SIGlzIHRvbyBn ZW5lcmljLCBpdCBjb25mbGljdHMgd2l0aCBtaW5ndzMyIEVSUk9SIGRlZmluaXRpb24uCgpSZXBs YWNlIEVSUk9SIHdpdGggSU5fRVJST1IuCgpTaWduZWQtb2ZmLWJ5OiBCbHVlIFN3aXJsIDxibGF1 d2lyYmVsQGdtYWlsLmNvbT4KLS0tCiBqc29uLWxleGVyLmMgfCAgICA2ICsrKy0tLQogMSBmaWxl cyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv anNvbi1sZXhlci5jIGIvanNvbi1sZXhlci5jCmluZGV4IGM3MzZmNDIuLjY1Yzk3MjAgMTAwNjQ0 Ci0tLSBhL2pzb24tbGV4ZXIuYworKysgYi9qc29uLWxleGVyLmMKQEAgLTI4LDcgKzI4LDcgQEAK ICAqLwogCiBlbnVtIGpzb25fbGV4ZXJfc3RhdGUgewotICAgIEVSUk9SID0gMCwKKyAgICBJTl9F UlJPUiA9IDAsCiAgICAgSU5fRFFfVUNPREUzLAogICAgIElOX0RRX1VDT0RFMiwKICAgICBJTl9E UV9VQ09ERTEsCkBAIC0xNTAsNyArMTUwLDcgQEAgc3RhdGljIGNvbnN0IHVpbnQ4X3QganNvbl9s ZXhlcltdWzI1Nl0gPSAgewogICAgIC8qIFplcm8gKi8KICAgICBbSU5fWkVST10gPSB7CiAgICAg ICAgIFRFUk1JTkFMKEpTT05fSU5URUdFUiksCi0gICAgICAgIFsnMCcgLi4uICc5J10gPSBFUlJP UiwKKyAgICAgICAgWycwJyAuLi4gJzknXSA9IElOX0VSUk9SLAogICAgICAgICBbJy4nXSA9IElO X01BTlRJU1NBLAogICAgIH0sCiAKQEAgLTMwMiw3ICszMDIsNyBAQCBzdGF0aWMgaW50IGpzb25f bGV4ZXJfZmVlZF9jaGFyKEpTT05MZXhlciAqbGV4ZXIsIGNoYXIgY2gpCiAgICAgICAgICAgICBs ZXhlci0+dG9rZW4gPSBxc3RyaW5nX25ldygpOwogICAgICAgICAgICAgbmV3X3N0YXRlID0gSU5f U1RBUlQ7CiAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgY2FzZSBFUlJPUjoKKyAgICAgICAg Y2FzZSBJTl9FUlJPUjoKICAgICAgICAgICAgIHJldHVybiAtRUlOVkFMOwogICAgICAgICBkZWZh dWx0OgogICAgICAgICAgICAgYnJlYWs7Ci0tIAoxLjcuMi41Cgo= --20cf307f38b8d4196d04a06e4a75--