Really add m4sugar to the repo.

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 38e3c8d51010310a42c75ae7e02b39db2024118b..10f4d7ee9f0f722ed137c1a46f12fa8b6dfbc0aa 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,5 +1,5 @@
 /* Find and resolve or report look-ahead conflicts for bison,
 /* 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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -22,13 +22,11 @@
 # define CONFLICTS_H_
 # include "state.h"
 
 # 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 solve_conflicts PARAMS ((void));
+void conflicts_print PARAMS ((void));
+void conflicts_output PARAMS ((FILE *out));
+void free_conflicts PARAMS ((void));

 
 /* Were there conflicts? */
 
 /* Were there conflicts? */

-extern int any_conflicts;
-extern errs **err_table;

 extern int expected_conflicts;
 #endif /* !CONFLICTS_H_ */
 extern int expected_conflicts;
 #endif /* !CONFLICTS_H_ */