From b78f9414c6db8d7c9c0ed3466a2a75bc1a7d215c Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Tue, 22 Apr 2003 19:54:20 +0000 Subject: [PATCH] * cpplex.c (_cpp_get_fresh_line): Pop the buffer if return_at_eof. From-SVN: r65954 --- gcc/ChangeLog | 6 +++++- gcc/cpplex.c | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ca69ac91ab0..69f116c3d93 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,7 +1,11 @@ +2003-04-22 Neil Booth + + * cpplex.c (_cpp_get_fresh_line): Pop the buffer if return_at_eof. 2003-04-22 Devang Patel - * cpptrad.c (_cpp_replacement_text_len): Add check for macro parameter count. + * cpptrad.c (_cpp_replacement_text_len): Add check for macro + parameter count. (_cpp_copy_replacement_text): Same. 2003-04-22 Neil Booth diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 552a40657e0..d6c617d3542 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -714,15 +714,15 @@ _cpp_get_fresh_line (pfile) "no newline at end of file"); } + if (!buffer->prev) + return false; + if (buffer->return_at_eof) { - buffer->return_at_eof = false; + _cpp_pop_buffer (pfile); return false; } - if (!buffer->prev) - return false; - _cpp_pop_buffer (pfile); } } -- 2.30.2