X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/92b16366ddbf8aca3974852048f97e8045e77e1d..9350499cfce9122ebb065a582ab17e321b2e8ff3:/src/conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 78bdb18c..2b8df518 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.
+/* Find and resolve or report lookahead conflicts for bison,
+   Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -15,19 +15,20 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 #ifndef CONFLICTS_H_
 # 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, int 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_ */