* doc/bison.texinfo (Stack Overflow): xref to Recursion.

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 10f4d7ee9f0f722ed137c1a46f12fa8b6dfbc0aa..2d814d74d814dd8c33533d04497a2a19a8166965 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, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 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,10 +22,11 @@
 # define CONFLICTS_H_
 # include "state.h"
 
 # define CONFLICTS_H_
 # include "state.h"
 

-void solve_conflicts PARAMS ((void));
+void conflicts_solve PARAMS ((void));

 void conflicts_print PARAMS ((void));
 void conflicts_print PARAMS ((void));

+int conflicts_total_count PARAMS ((void));

 void conflicts_output PARAMS ((FILE *out));
 void conflicts_output PARAMS ((FILE *out));

-void free_conflicts PARAMS ((void));
+void conflicts_free PARAMS ((void));

 
 /* Were there conflicts? */
 extern int expected_conflicts;
 
 /* Were there conflicts? */
 extern int expected_conflicts;