* src/output.c (output_obstack): Be static and rename as...

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 99a504c82304f31d8558db8fdf4491273a5b7735..78bdb18c9630f4c1d8c3e5bf7e72ef6f7b710ce3 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 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -23,12 +23,11 @@
 # include "state.h"
 
 void solve_conflicts PARAMS ((void));
-void print_conflicts PARAMS ((FILE *out));
-void print_reductions PARAMS ((int));
+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_ */