X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0df87bb6096b345a0a25714ee64c3a49596f2778..b778eff5f9d6e605c4cbcd9186e0b3944a567ce9:/src/conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index ad5d4893..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 solve_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 print_reductions PARAMS ((int));
-void free_conflicts PARAMS ((void));
+void conflicts_free PARAMS ((void));
 
 /* Were there conflicts? */
-extern errs **err_table;
 extern int expected_conflicts;
 #endif /* !CONFLICTS_H_ */