aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Booth <neil@daikokuya.co.uk>2002-07-01 12:47:54 +0000
committerNeil Booth <neil@gcc.gnu.org>2002-07-01 12:47:54 +0000
commit590e1987d2ed82ea4c6b900d243df3852e272cde (patch)
treefb0aa34a235b0da95674aa0a5181f244b7f205a6
parent8bf3ccbbbd4cfbcd1ca9e16f57af9c7ae387b07d (diff)
downloadgcc-590e1987d2ed82ea4c6b900d243df3852e272cde.zip
gcc-590e1987d2ed82ea4c6b900d243df3852e272cde.tar.gz
gcc-590e1987d2ed82ea4c6b900d243df3852e272cde.tar.bz2
* cppmacro.c: Forgotten commit.
From-SVN: r55134
-rw-r--r--gcc/ChangeLog2
-rw-r--r--gcc/cppmacro.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d2dac95..e61eb0e 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 99cdc19..6b1fcec 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