From c933c209ddf06f94796eeba7d6df75a001bd87fc Mon Sep 17 00:00:00 2001 From: Chris Demetriou Date: Tue, 23 Jan 2001 19:20:14 +0000 Subject: [PATCH] cpperror.c: Merge handlers of PEDWARN and WARNING. * cpperror.c: Merge handlers of PEDWARN and WARNING. Have -Werror make pedantic warnings errors, like the rest of GCC. Co-Authored-By: Neil Booth From-SVN: r39206 --- gcc/ChangeLog | 7 +++++++ gcc/cpperror.c | 25 ++++--------------------- 2 files changed, 11 insertions(+), 21 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 32ccbcfa5d5..039a3b18a14 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2001-01-23 Chris Demetriou + Neil Booth + + * cpperror.c: Merge handlers of PEDWARN and WARNING. + Have -Werror make pedantic warnings errors, like the + rest of GCC. + 2001-01-23 Phil Edwards * c-tree.texi (IDENTIFIER_LENGTH): Fix typo. diff --git a/gcc/cpperror.c b/gcc/cpperror.c index cfd4ce540f6..50bd9076dbd 100644 --- a/gcc/cpperror.c +++ b/gcc/cpperror.c @@ -154,42 +154,25 @@ _cpp_begin_message (pfile, code, file, pos) switch (code) { + case PEDWARN: case WARNING: if (CPP_IN_SYSTEM_HEADER (pfile) && ! CPP_OPTION (pfile, warn_system_headers)) return 0; - if (! CPP_OPTION (pfile, warnings_are_errors)) - { - if (CPP_OPTION (pfile, inhibit_warnings)) - return 0; - is_warning = 1; - } - else + if (CPP_OPTION (pfile, warnings_are_errors) + || (code == PEDWARN && CPP_OPTION (pfile, pedantic_errors))) { if (CPP_OPTION (pfile, inhibit_errors)) return 0; if (pfile->errors < CPP_FATAL_LIMIT) pfile->errors++; } - break; - - case PEDWARN: - if (CPP_IN_SYSTEM_HEADER (pfile) - && ! CPP_OPTION (pfile, warn_system_headers)) - return 0; - if (! CPP_OPTION (pfile, pedantic_errors)) + else { if (CPP_OPTION (pfile, inhibit_warnings)) return 0; is_warning = 1; } - else - { - if (CPP_OPTION (pfile, inhibit_errors)) - return 0; - if (pfile->errors < CPP_FATAL_LIMIT) - pfile->errors++; - } break; case ERROR: -- 2.30.2