Cygnus<-->FSF merge

From-SVN: r2750

3 files changed, 4 insertions, 3 deletions

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6e3310f..7ec687d 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -736,7 +736,7 @@ cp-parse.o : $(srcdir)/cp-parse.c $(CONFIG_H) $(CPLUS_TREE_H) flags.h
   `echo $(srcdir)/cp-parse.c | sed 's,^\./,,'`
 
 $(srcdir)/cp-parse.c $(srcdir)/cp-parse.h : $(srcdir)/cp-parse.y
-	@echo expect 30 shift/reduce conflicts and 14 reduce/reduce conflicts
+	@echo expect 29 shift/reduce conflicts and 14 reduce/reduce conflicts
 	cd $(srcdir); $(BISON) $(BISONFLAGS) -d -o cp-parse.c cp-parse.y
 	cd $(srcdir); grep '^#define[ 	]*YYEMPTY' cp-parse.c >>cp-parse.h
 
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 4800129..44950b9 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -1373,8 +1373,6 @@ warn_if_unused_value (exp)
     case CALL_EXPR:
     case METHOD_CALL_EXPR:
     case RTL_EXPR:
-    case WRAPPER_EXPR:
-    case ANTI_WRAPPER_EXPR:
     case WITH_CLEANUP_EXPR:
     case EXIT_EXPR:
       /* We don't warn about COND_EXPR because it may be a useful
diff --git a/gcc/tree.h b/gcc/tree.h
index e5a9d7a..82bd090 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1354,6 +1354,9 @@ extern int all_types_permanent;
 
 extern char *(*decl_printable_name) ();
 
+/* In tree.c */
+extern char *perm_calloc			PROTO((int, long));
+
 /* In stmt.c */
 
 extern tree expand_start_stmt_expr		PROTO((void));