X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/065fbd27af96e4aa82b5f3354870b0dcfee72ce8..95f22ad2a777be59535616142910f8914dac6f26:/src/conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index cf04c0e9..fdf83893 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, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -22,12 +22,13 @@
 # define CONFLICTS_H_
 # include "state.h"
 
-void solve_conflicts PARAMS ((void));
-void conflicts_print PARAMS ((void));
-void conflicts_output PARAMS ((FILE *out));
-void print_reductions PARAMS ((FILE*out, state_t *state));
-void free_conflicts PARAMS ((void));
+void conflicts_solve (void);
+void conflicts_print (void);
+int conflicts_total_count (void);
+void conflicts_output (FILE *out);
+void conflicts_free (void);
 
 /* Were there conflicts? */
-extern int expected_conflicts;
+extern int expected_sr_conflicts;
+extern int expected_rr_conflicts;
 #endif /* !CONFLICTS_H_ */