From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Tue, 14 Aug 2012 15:36:20 +0000 (+0200)
Subject: error message replacement
X-Git-Tag: 0.1-rc1~290
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ef6da8e5bab6de19d26a415d7204cce6e94088e;p=xonotic%2Fgmqcc.git

error message replacement
---

diff --git a/parser.c b/parser.c
index e65eff3..e83edb7 100644
--- a/parser.c
+++ b/parser.c
@@ -1579,7 +1579,8 @@ static bool parser_variable(parser_t *parser, ast_block *localblock)
              */
             if (proto) {
                 if (!ast_compare_type((ast_expression*)proto, (ast_expression*)fval)) {
-                    parseerror(parser, "prototype declared at %s:%i had a different type",
+                    parseerror(parser, "conflicting types for `%s`, previous declaration was here: %s:%i",
+                               proto->name,
                                ast_ctx(proto).file, ast_ctx(proto).line);
                     ast_function_delete(func);
                     ast_value_delete(fval);