* src/parse-gram.y: Define PERCENT_EXPECT_RR.

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index bd21253ecf182bedb020b3188e4df9039738f60f..50b785e6553c9d2bb0bb095096ce74f78e06c975 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -22,11 +22,13 @@
 # define CONFLICTS_H_
 # include "state.h"
 
 # define CONFLICTS_H_
 # include "state.h"
 

-void conflicts_solve PARAMS ((void));
-void conflicts_print PARAMS ((void));
-void conflicts_output PARAMS ((FILE *out));
-void conflicts_free PARAMS ((void));
+void conflicts_solve (void);
+void conflicts_print (void);
+int conflicts_total_count (void);
+void conflicts_output (FILE *out);
+void conflicts_free (void);

 
 /* Were there conflicts? */
 
 /* Were there conflicts? */

-extern int expected_conflicts;
+extern int expected_sr_conflicts;
+extern int expected_rr_conflicts;

 #endif /* !CONFLICTS_H_ */
 #endif /* !CONFLICTS_H_ */