diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index bb44d3ce5b3..323a75786a6 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 ad68682e99e..91bc9dd0782 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