From: Marek Polacek Date: Wed, 21 May 2014 18:54:12 +0000 (+0000) Subject: re PR c/61212 (gcc build failure on "dos file system" due to warnings treated as... X-Git-Tag: releases/gcc-5.1.0~7386 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=289395899601bacfaa9f9f93c454b85337867c5b;p=thirdparty%2Fgcc.git re PR c/61212 (gcc build failure on "dos file system" due to warnings treated as errors) PR c/61212 * files.c (find_file_in_dir): Add parens around &&. From-SVN: r210722 --- diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index bb44d3ce5b32..323a75786a6f 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,6 +1,11 @@ +2014-05-21 Marek Polacek + + PR c/61212 + * files.c (find_file_in_dir): Add parens around &&. + 2014-05-20 Edward Smith-Rowland <3dw4rd@verizon.net> - PR C++/61038 + PR c++/61038 * macro.c (stringify_arg (cpp_reader *, macro_arg *)): Check for user-defined literal strings and user-defined literal chars to escape necessary characters. diff --git a/libcpp/files.c b/libcpp/files.c index ad68682e99e7..91bc9dd07827 100644 --- a/libcpp/files.c +++ b/libcpp/files.c @@ -390,7 +390,7 @@ find_file_in_dir (cpp_reader *pfile, _cpp_file *file, bool *invalid_pch) /* We try to canonicalize system headers. For DOS based file * system, we always try to shorten non-system headers, as DOS * has a tighter constraint on max path length. */ - if (CPP_OPTION (pfile, canonical_system_headers) && file->dir->sysp + if ((CPP_OPTION (pfile, canonical_system_headers) && file->dir->sysp) #ifdef HAVE_DOS_BASED_FILE_SYSTEM || !file->dir->sysp #endif