X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/aa7815f5c6e8e07a85e47df9cd7b579468969efb..eeeb962b:/src/conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 38e3c8d5..b74cb22c 100644
--- 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_ */