Cygnus<-->FSF merge
From-SVN: r2750
This commit is contained in:
parent
6d77ee8957
commit
143f1945b9
@ -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,^\./,,'`
|
`echo $(srcdir)/cp-parse.c | sed 's,^\./,,'`
|
||||||
|
|
||||||
$(srcdir)/cp-parse.c $(srcdir)/cp-parse.h : $(srcdir)/cp-parse.y
|
$(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); $(BISON) $(BISONFLAGS) -d -o cp-parse.c cp-parse.y
|
||||||
cd $(srcdir); grep '^#define[ ]*YYEMPTY' cp-parse.c >>cp-parse.h
|
cd $(srcdir); grep '^#define[ ]*YYEMPTY' cp-parse.c >>cp-parse.h
|
||||||
|
|
||||||
|
@ -1373,8 +1373,6 @@ warn_if_unused_value (exp)
|
|||||||
case CALL_EXPR:
|
case CALL_EXPR:
|
||||||
case METHOD_CALL_EXPR:
|
case METHOD_CALL_EXPR:
|
||||||
case RTL_EXPR:
|
case RTL_EXPR:
|
||||||
case WRAPPER_EXPR:
|
|
||||||
case ANTI_WRAPPER_EXPR:
|
|
||||||
case WITH_CLEANUP_EXPR:
|
case WITH_CLEANUP_EXPR:
|
||||||
case EXIT_EXPR:
|
case EXIT_EXPR:
|
||||||
/* We don't warn about COND_EXPR because it may be a useful
|
/* We don't warn about COND_EXPR because it may be a useful
|
||||||
|
@ -1354,6 +1354,9 @@ extern int all_types_permanent;
|
|||||||
|
|
||||||
extern char *(*decl_printable_name) ();
|
extern char *(*decl_printable_name) ();
|
||||||
|
|
||||||
|
/* In tree.c */
|
||||||
|
extern char *perm_calloc PROTO((int, long));
|
||||||
|
|
||||||
/* In stmt.c */
|
/* In stmt.c */
|
||||||
|
|
||||||
extern tree expand_start_stmt_expr PROTO((void));
|
extern tree expand_start_stmt_expr PROTO((void));
|
||||||
|
Loading…
Reference in New Issue
Block a user