From: Daniel Franke <franke.daniel@gmail.com>
Date: Thu, 19 Feb 2009 18:23:20 +0000 (-0500)
Subject: scanner.c (load_line): At end of line, skip '\r' without setting the truncation flag.
X-Git-Tag: releases/gcc-4.4.0~491
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c747b97475ae55912a172e8c94fcbe910e3f2c6;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 694c67f46081..147891a0822f 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 c45827f08a1c..f457b3250842 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;