aboutsummaryrefslogtreecommitdiff
path: root/gcc/cppmacro.c
diff options
context:
space:
mode:
authorPer Bothner <pbothner@apple.com>2003-10-02 07:30:34 +0000
committerPer Bothner <bothner@gcc.gnu.org>2003-10-02 00:30:34 -0700
commit40de9f7604b99da9e0b9e3eed7df9a3c34c7e1da (patch)
treec20dbb16aaad4d46e1efbbdb072fa9eb2e5cb387 /gcc/cppmacro.c
parent31703a61a7f15e58788363c4c110421b44610743 (diff)
downloadgcc-40de9f7604b99da9e0b9e3eed7df9a3c34c7e1da.zip
gcc-40de9f7604b99da9e0b9e3eed7df9a3c34c7e1da.tar.gz
gcc-40de9f7604b99da9e0b9e3eed7df9a3c34c7e1da.tar.bz2
cpplib.c (_cpp_pop_buffer): Do generate a _cpp_do_file_change callback even when popping the main file.
* cpplib.c (_cpp_pop_buffer): Do generate a _cpp_do_file_change callback even when popping the main file. * cpplib.c (cpp_push_buffer): Since we no longer set return_at_eof, remove the unused return_at_eof parameter. * cppfiles.c, cpplib.c, cppmacro.c, cpppch.c, fix-header.c: Update callers of cpp_push_buffer. From-SVN: r72016
Diffstat (limited to 'gcc/cppmacro.c')
-rw-r--r--gcc/cppmacro.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index 045d4e3..43f688a 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -270,7 +270,7 @@ builtin_macro (cpp_reader *pfile, cpp_hashnode *node)
memcpy (nbuf, buf, len);
nbuf[len]='\n';
- cpp_push_buffer (pfile, (uchar *) nbuf, len, /* from_stage3 */ true, 1);
+ cpp_push_buffer (pfile, (uchar *) nbuf, len, /* from_stage3 */ true);
_cpp_clean_line (pfile);
/* Set pfile->cur_token as required by _cpp_lex_direct. */
@@ -426,7 +426,7 @@ paste_tokens (cpp_reader *pfile, const cpp_token **plhs, const cpp_token *rhs)
end = cpp_spell_token (pfile, rhs, end);
*end = '\n';
- cpp_push_buffer (pfile, buf, end - buf, /* from_stage3 */ true, 1);
+ cpp_push_buffer (pfile, buf, end - buf, /* from_stage3 */ true);
_cpp_clean_line (pfile);
/* Set pfile->cur_token as required by _cpp_lex_direct. */
@@ -1136,10 +1136,6 @@ cpp_sys_macro_p (cpp_reader *pfile)
void
cpp_scan_nooutput (cpp_reader *pfile)
{
- /* Request a CPP_EOF token at the end of this file, rather than
- transparently continuing with the including file. */
- pfile->buffer->return_at_eof = true;
-
if (CPP_OPTION (pfile, traditional))
while (_cpp_read_logical_line_trad (pfile))
;