From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Sun, 16 Nov 2008 10:36:19 +0000 (+0000)
Subject: Fix condition of multi-char constant warning.
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=d2c97d08e22cfca07b4ac98ae8d4a9c5cb3b9261;p=cparser

Fix condition of multi-char constant warning.

[r23706]
---

diff --git a/parser.c b/parser.c
index d5a31ad..dcd6cdc 100644
--- a/parser.c
+++ b/parser.c
@@ -6314,10 +6314,10 @@ static expression_t *parse_character_constant(void)
 	cnst->conste.v.character = token.v.string;
 
 	if (cnst->conste.v.character.size != 1) {
-		if (warning.multichar && GNU_MODE) {
+		if (!GNU_MODE) {
+			errorf(HERE, "more than 1 character in character constant");
+		} else if (warning.multichar) {
 			warningf(HERE, "multi-character character constant");
-		} else {
-			errorf(HERE, "more than 1 characters in character constant");
 		}
 	}
 	next_token();
@@ -6335,10 +6335,10 @@ static expression_t *parse_wide_character_constant(void)
 	cnst->conste.v.wide_character = token.v.wide_string;
 
 	if (cnst->conste.v.wide_character.size != 1) {
-		if (warning.multichar && GNU_MODE) {
+		if (!GNU_MODE) {
+			errorf(HERE, "more than 1 character in character constant");
+		} else if (warning.multichar) {
 			warningf(HERE, "multi-character character constant");
-		} else {
-			errorf(HERE, "more than 1 characters in character constant");
 		}
 	}
 	next_token();