maint: address sc_bindtextdomain, sc_program_name and sc_prohibit_HAVE_MBRTOWC.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index f6f58b5fff6ca809c0a474c1d5711e2e3245c34b..85f686ef7c71d4c2179683eea784351c0c2bfa1c 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
    Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
-   2009-2011 Free Software Foundation, Inc.
+   2009-2012 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -22,7 +22,6 @@
 #include "system.h"
 
 #include <quote.h>
-#include <quotearg.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,
-                   _("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"));
     }