* data/yacc.c (yyparse): Pacify non-GCC compilers about yyerrorlab

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index b74cb22c3f3f1477eb12bb29b711ba109625196d..fdf8389302dda372964b9e51509876dae6dd4e0b 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 (C) 2000, 2001, 2002, 2004 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,13 @@
 # define CONFLICTS_H_
 # include "state.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? */
 
 /* Were there conflicts? */

-extern errs **err_table;
-extern int expected_conflicts;
+extern int expected_sr_conflicts;
+extern int expected_rr_conflicts;

 #endif /* !CONFLICTS_H_ */
 #endif /* !CONFLICTS_H_ */