Renaming file to glr.c.

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index b74cb22c3f3f1477eb12bb29b711ba109625196d..bd21253ecf182bedb020b3188e4df9039738f60f 100644 (file)
--- 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,11 @@
 # define CONFLICTS_H_
 # include "state.h"
 
-void solve_conflicts PARAMS ((void));
+void conflicts_solve 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));
+void conflicts_free PARAMS ((void));
 
 /* Were there conflicts? */
-extern errs **err_table;
 extern int expected_conflicts;
 #endif /* !CONFLICTS_H_ */