Don't include quote.h; not needed.

(get_merge_function): Reword warning to be consistent with type clash
diagnostic in grammar_current_rule_check.
This commit is contained in:
Paul Eggert
2002-11-03 07:49:40 +00:00
parent 9e4c5cb833
commit 397477b4e9

View File

@@ -22,7 +22,6 @@
#include "system.h"
#include "quotearg.h"
#include "quote.h"
#include "getargs.h"
#include "files.h"
#include "symtab.h"
@@ -138,8 +137,8 @@ get_merge_function (const char* name, const char* type,
merge_functions = head.next;
}
else if (strcmp (type, syms->next->type) != 0)
warn_at (loc, _("result type clash on merge function %s: `%s' vs. `%s'"),
name, type, syms->next->type);
warn_at (loc, _("result type clash (`%s' `%s') on merge function %s"),
type, syms->next->type, name);
return n;
}