Revert "made previous commit less hairy"

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 989dfc256689d7c706c307dee8139f849a670c97..105c5ceb5efae9739dd85f49a6f85a9b9e1ead32 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -602,8 +602,10 @@ conflicts_print (void)
     }
   if (src_total | rrc_total)
     {
     }
   if (src_total | rrc_total)
     {

-      if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1)
-        set_warning_issued ();
+      if (expected_sr_conflicts == -1 && src_total)
+        set_warning_issued (Wconflicts_sr);
+      if (expected_rr_conflicts == -1 && rrc_total)
+        set_warning_issued (Wconflicts_rr);

       if (! yacc_flag)
         fprintf (stderr, "%s: ", current_file);
       conflict_report (stderr, src_total, rrc_total);
       if (! yacc_flag)
         fprintf (stderr, "%s: ", current_file);
       conflict_report (stderr, src_total, rrc_total);