* Makefile.in (CONFLICTS): Fix s/r conflict count to 18.

From-SVN: r15514

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 148691be9c1da5378a147c20b7f2af49c8ab1f76..185f24b9f6a134e2c3fa135b01757c1975e1fe52 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+1997-09-17  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+       * Makefile.in (CONFLICTS): Fix s/r conflict count to 18.
+
 Tue Sep 16 14:06:56 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
        * call.c (build_new_op): Give better error for syntactically

diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in
index b68779e8794b865a68586ef4e4eca16bb197c575..5394c263e509526262b45cbaf201b67da763d858 100644 (file)
--- a/gcc/cp/Makefile.in
+++ b/gcc/cp/Makefile.in
@@ -201,7 +201,7 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h
        $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \
   `echo $(PARSE_C) | sed 's,^\./,,'`
 
-CONFLICTS = expect 20 shift/reduce conflicts and 39 reduce/reduce conflicts.
+CONFLICTS = expect 18 shift/reduce conflicts and 39 reduce/reduce conflicts.
 $(PARSE_H) : $(PARSE_C)
 $(PARSE_C) : $(srcdir)/parse.y
        @echo $(CONFLICTS)