* m4/cxx.m4 (BISON_TEST_FOR_WORKING_CXX_COMPILER): Check that

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 2d814d74d814dd8c33533d04497a2a19a8166965..4389e5eccaf795ce977502c202c8a4f226a7679d 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 (C) 2000, 2001, 2002 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.
 


@@ -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
 
    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"
 
 
 #ifndef CONFLICTS_H_
 # define CONFLICTS_H_
 # include "state.h"
 

-void conflicts_solve PARAMS ((void));
-void conflicts_print PARAMS ((void));
-int conflicts_total_count PARAMS ((void));
-void conflicts_output PARAMS ((FILE *out));
-void conflicts_free 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 int expected_conflicts;
+extern int expected_sr_conflicts;
+extern int expected_rr_conflicts;

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