Use ASCII for Sebastien Fricker's name.

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 234283a4057b68c4019ae5d53374321db28b8397..2b8df518a068f6ef2cb0301741ff202fc96d6766 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,5 +1,5 @@
-/* Find and resolve or report look-ahead conflicts for bison,
-   Copyright (C) 2000, 2001, 2002 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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -15,8 +15,8 @@
 
    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_
 
 #ifndef CONFLICTS_H_
 # define CONFLICTS_H_


@@ -29,5 +29,6 @@ void conflicts_output (FILE *out);
 void conflicts_free (void);
 
 /* Were there conflicts? */
 void conflicts_free (void);
 
 /* Were there conflicts? */

-extern int expected_conflicts;
+extern int expected_sr_conflicts;
+extern int expected_rr_conflicts;

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