diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/c-decl.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ce4b84a..8940ad5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +Wed Jun 10 23:23:17 1998 Graham <grahams@rcp.co.uk> + + * c-decl.c (start_decl): Correct test for -Wmain. + Wed Jun 10 14:52:27 1998 Jim Wilson <wilson@cygnus.com> * expr.c (expand_builtin_setjmp): Store const1_rtx in target. @@ -15,7 +19,8 @@ Wed Jun 10 13:41:23 1998 Dave Brolley <brolley@cygnus.com> * cppmain.c (fatal): New function. * configure.in (cpp_main): New configuration variable. * configure: Regenerated. - * Makefile.in (CCCP): Use a configuration variable to select base for cccp. + * Makefile.in (CCCP): Use a configuration variable to select basex + for cccp. (cppmain$(exeext)): Add @extra_cpp_objs@. Wed Jun 10 13:07:02 1998 Dave Brolley <brolley@cygnus.com> diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 94dade7..dde17ad 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -3690,7 +3690,8 @@ start_decl (declarator, declspecs, initialized, attributes, prefix_attributes) /* The corresponding pop_obstacks is in finish_decl. */ push_obstacks_nochange (); - if (warn_main && !strcmp (IDENTIFIER_POINTER (declarator), "main")) + if (warn_main && TREE_CODE (decl) != FUNCTION_DECL + && !strcmp (IDENTIFIER_POINTER (DECL_NAME (decl)), "main")) warning_with_decl (decl, "`%s' is usually a function"); if (initialized) |