* src/closure.c (closure): `r' and `c' are new variables, used to

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 38e3c8d51010310a42c75ae7e02b39db2024118b..b74cb22c3f3f1477eb12bb29b711ba109625196d 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -22,13 +22,13 @@
 # define CONFLICTS_H_
 # include "state.h"
 
-void initialize_conflicts PARAMS ((void));
-void print_conflicts PARAMS ((void));
-void print_reductions PARAMS ((int));
-void finalize_conflicts PARAMS ((void));
+void solve_conflicts PARAMS ((void));
+void conflicts_print PARAMS ((void));
+void conflicts_output PARAMS ((FILE *out));
+void print_reductions PARAMS ((FILE*out, int state));
+void free_conflicts PARAMS ((void));
 
 /* Were there conflicts? */
-extern int any_conflicts;
 extern errs **err_table;
 extern int expected_conflicts;
 #endif /* !CONFLICTS_H_ */