X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/aa7815f5c6e8e07a85e47df9cd7b579468969efb..d1a1114f7f257f89887ea5825ba0d896dfaa747b:/src/conflicts.h?ds=sidebyside

diff --git a/src/conflicts.h b/src/conflicts.h
index 38e3c8d5..2d814d74 100644
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,5 +1,5 @@
 /* Find and resolve or report look-ahead conflicts for bison,
-   Copyright 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -22,13 +22,12 @@
 # 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 conflicts_solve PARAMS ((void));
+void conflicts_print PARAMS ((void));
+int conflicts_total_count PARAMS ((void));
+void conflicts_output PARAMS ((FILE *out));
+void conflicts_free PARAMS ((void));
 
 /* Were there conflicts? */
-extern int any_conflicts;
-extern errs **err_table;
 extern int expected_conflicts;
 #endif /* !CONFLICTS_H_ */