aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDaniel Franke <franke.daniel@gmail.com>2009-02-19 13:23:20 -0500
committerDaniel Franke <dfranke@gcc.gnu.org>2009-02-19 13:23:20 -0500
commit9c747b97475ae55912a172e8c94fcbe910e3f2c6 (patch)
tree7462643f85fc00962af6640d1e1a45d3cd352c27 /gcc
parent68017cb410dc476560ef648be47189825fef365a (diff)
downloadgcc-9c747b97475ae55912a172e8c94fcbe910e3f2c6.zip
gcc-9c747b97475ae55912a172e8c94fcbe910e3f2c6.tar.gz
gcc-9c747b97475ae55912a172e8c94fcbe910e3f2c6.tar.bz2
scanner.c (load_line): At end of line, skip '\r' without setting the truncation flag.
2009-02-19 Daniel Franke <franke.daniel@gmail.com> * scanner.c (load_line): At end of line, skip '\r' without setting the truncation flag. From-SVN: r144303
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/scanner.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 694c67f..147891a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-19 Daniel Franke <franke.daniel@gmail.com>
+
+ * scanner.c (load_line): At end of line, skip '\r' without setting
+ the truncation flag.
+
2009-02-18 Daniel Kraft <d@domob.eu>
* gfortran.texi: New chapter about compiler characteristics.
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index c45827f..f457b32 100644
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -1469,6 +1469,9 @@ load_line (FILE *input, gfc_char_t **pbuf, int *pbuflen, const int *first_char)
for (;;)
{
c = getc (input);
+ if (c == '\r')
+ continue;
+
if (c == '\n' || c == EOF)
break;