Merge branch 'maint'

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index a67f4c7cc397231424d09f69e0b0cb037b6f77fc..a3f8668524a8eccaa03f8c82d894bab6f66b5228 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -129,15 +129,15 @@ record_merge_function_type (int merger, uniqstr type, location declaration_loc)
   if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
     {
       unsigned indent = 0;
   if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
     {
       unsigned indent = 0;

-      complain_at_indent (declaration_loc, complaint, &indent,
-                          _("result type clash on merge function %s: "
-                            "<%s> != <%s>"),
-                          quote (merge_function->name), type,
-                          merge_function->type);
+      complain_indent (&declaration_loc, complaint, &indent,
+                       _("result type clash on merge function %s: "
+                         "<%s> != <%s>"),
+                       quote (merge_function->name), type,
+                       merge_function->type);

       indent += SUB_INDENT;
       indent += SUB_INDENT;

-      complain_at_indent (merge_function->type_declaration_location, complaint,
-                          &indent,
-                          _("previous declaration"));
+      complain_indent (&merge_function->type_declaration_location, complaint,
+                       &indent,
+                       _("previous declaration"));

     }
   merge_function->type = uniqstr_new (type);
   merge_function->type_declaration_location = declaration_loc;
     }
   merge_function->type = uniqstr_new (type);
   merge_function->type_declaration_location = declaration_loc;