From: Neil Booth <neil@daikokuya.co.uk>
Date: Mon, 1 Jul 2002 12:47:54 +0000 (+0000)
Subject: * cppmacro.c: Forgotten commit.
X-Git-Tag: releases/gcc-3.3.0~4028
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=590e1987d2ed82ea4c6b900d243df3852e272cde;p=thirdparty%2Fgcc.git

* cppmacro.c: Forgotten commit.

From-SVN: r55134
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d2dac9579177..e61eb0e786f2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -97,7 +97,7 @@ Fri Jun 28 17:22:37 2002  Denis Chertykov  <denisc@overta.ru>
 
 	PR preprocessor/7150
 	* cppmain.c (scan_translation_unit_trad): Simplify.
-	* cpplib.c (cpp_scan_nooutput): Handle traditional case.
+	* cppmacro.c (cpp_scan_nooutput): Handle traditional case.
 
 2002-06-29  Neil Booth  <neil@daikokuya.demon.co.uk>
 
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index 99cdc19e0073..6b1fcec5c761 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -1136,8 +1136,12 @@ cpp_scan_nooutput (pfile)
      transparently continuing with the including file.  */
   pfile->buffer->return_at_eof = true;
 
-  while (cpp_get_token (pfile)->type != CPP_EOF)
-    ;
+  if (CPP_OPTION (pfile, traditional))
+    while (_cpp_read_logical_line_trad (pfile))
+      ;
+  else
+    while (cpp_get_token (pfile)->type != CPP_EOF)
+      ;
 }
 
 /* Step back one (or more) tokens.  Can only step mack more than 1 if