diff options
| author | Marek Polacek <mpolacek@gcc.gnu.org> | 2014-05-21 18:54:12 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2014-05-21 18:54:12 +0000 |
| commit | 289395899601bacfaa9f9f93c454b85337867c5b (patch) | |
| tree | dc22c597e050c45d675564d83c4baf8498fa4531 /libcpp | |
| parent | 174ebf656274b6119c13a730294241fd5c0efb55 (diff) | |
| download | gcc-289395899601bacfaa9f9f93c454b85337867c5b.zip gcc-289395899601bacfaa9f9f93c454b85337867c5b.tar.gz gcc-289395899601bacfaa9f9f93c454b85337867c5b.tar.bz2 | |
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
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | libcpp/files.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index bb44d3c..323a757 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,6 +1,11 @@ +2014-05-21 Marek Polacek <polacek@redhat.com> + + 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 ad68682..91bc9dd 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 |