projects
/
bison.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
regen.
[bison.git]
/
src
/
reader.c
diff --git
a/src/reader.c
b/src/reader.c
index 942e8cfc5d2c63c7e423902d72d50af2deb61e37..7dd0aaa46c7b13d528e31a18746a4501175bd945 100644
(file)
--- a/
src/reader.c
+++ b/
src/reader.c
@@
-22,7
+22,6
@@
#include "system.h"
#include <quote.h>
#include "system.h"
#include <quote.h>
-#include <quotearg.h>
#include "complain.h"
#include "conflicts.h"
#include "complain.h"
#include "conflicts.h"
@@
-130,8
+129,8
@@
record_merge_function_type (int merger, uniqstr type, location declaration_loc)
if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
{
complain_at (declaration_loc,
if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
{
complain_at (declaration_loc,
-
_("result type clash on merge function `%s'
: <%s> != <%s>"),
-
merge_function->name
, type, merge_function->type);
+
_("result type clash on merge function %s
: <%s> != <%s>"),
+
quote (merge_function->name)
, type, merge_function->type);
complain_at (merge_function->type_declaration_location,
_("previous declaration"));
}
complain_at (merge_function->type_declaration_location,
_("previous declaration"));
}