aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry DeLisle <jvdelisle@gcc.gnu.org>2016-03-19 20:28:38 +0000
committerJerry DeLisle <jvdelisle@gcc.gnu.org>2016-03-19 20:28:38 +0000
commit5803aa7c286fa2ad522e6daadf96bbaf4043244e (patch)
treea56f2555dbb81df15f1e6a8044544b2a448dc47e
parent1ee37b83cc14b93a0441aec5dd0f57805097998b (diff)
downloadgcc-5803aa7c286fa2ad522e6daadf96bbaf4043244e.zip
gcc-5803aa7c286fa2ad522e6daadf96bbaf4043244e.tar.gz
gcc-5803aa7c286fa2ad522e6daadf96bbaf4043244e.tar.bz2
re PR fortran/69043 (Trying to include a directory causes an infinite loop)
2016-03-19 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR fortran/69043 * scanner.c (load_file): Update to use S_ISREG macro. From-SVN: r234352
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/scanner.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 105e7b4..dac67d1 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-19 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+
+ PR fortran/69043
+ * scanner.c (load_file): Update to use S_ISREG macro.
+
2016-03-17 Thomas Schwinge <thomas@codesourcery.com>
* gfortran.h (enum gfc_omp_map_op): Rename OMP_MAP_FORCE_DEALLOC
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index 33d96d8..f4dedd6 100644
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -2246,7 +2246,7 @@ load_file (const char *realfilename, const char *displayedname, bool initial)
return false;
}
stat_result = stat (realfilename, &st);
- if (stat_result == 0 && !(st.st_mode & S_IFREG))
+ if (stat_result == 0 && !S_ISREG(st.st_mode))
{
fprintf (stderr, "%s:%d: Error: Included path '%s'"
" is not a regular file\n",