* tests/regression.at (Invalid input): Remove, duplicate with

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 43c8a2c6c02416336d3ae11ba8f8a4613de6839a..99a504c82304f31d8558db8fdf4491273a5b7735 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 (C) 2000 Free Software Foundation, Inc.
+   Copyright 2000 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -20,11 +20,12 @@
 
 #ifndef CONFLICTS_H_
 # define CONFLICTS_H_
+# include "state.h"
 
-void initialize_conflicts PARAMS ((void));
-void print_conflicts PARAMS ((void));
+void solve_conflicts PARAMS ((void));
+void print_conflicts PARAMS ((FILE *out));
 void print_reductions PARAMS ((int));
-void finalize_conflicts PARAMS ((void));
+void free_conflicts PARAMS ((void));
 
 /* Were there conflicts? */
 extern int any_conflicts;