From 7a4310c8250033c469ce1b8c56a76df64fad401a Mon Sep 17 00:00:00 2001 From: Alexander Kabaev Date: Fri, 22 Aug 2003 03:26:30 +0000 Subject: [PATCH] Merge FreeBSD modifications into gcc 3.3.1-prerelease: 1.2 don't let gcc(1) hide warnings in system headers. Don't disable warning suppression unconditionally, but rather make in dependent on warn_system_headers flag, one should be able to use -Wno-system-headers flag if warnings from system headers are not desired. --- contrib/gcc/c-lex.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/contrib/gcc/c-lex.c b/contrib/gcc/c-lex.c index 30f89ab156cb..dcfdc107e361 100644 --- a/contrib/gcc/c-lex.c +++ b/contrib/gcc/c-lex.c @@ -299,11 +299,13 @@ cb_file_change (pfile, new_map) } update_header_times (new_map->to_file); -#ifndef FREEBSD_NATIVE - in_system_header = new_map->sysp != 0; -#else /* FREEBSD_NATIVE */ - in_system_header = 0; -#endif /* FREEBSD_NATIVE */ + in_system_header = (warn_system_headers && new_map->sysp != 0); +#ifdef FREEBSD_NATIVE + /* Correct logic should be: if warn_system_headers is set, no + header file should be considered system, so that no warnings + will be suppressed. */ + if (warn_system_headers) in_system_header = 0; +#endif input_filename = new_map->to_file; lineno = to_line; map = new_map;