diff options
| author | Per Bothner <pbothner@apple.com> | 2003-10-02 07:30:34 +0000 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2003-10-02 00:30:34 -0700 |
| commit | 40de9f7604b99da9e0b9e3eed7df9a3c34c7e1da (patch) | |
| tree | c20dbb16aaad4d46e1efbbdb072fa9eb2e5cb387 /gcc/cpplib.c | |
| parent | 31703a61a7f15e58788363c4c110421b44610743 (diff) | |
| download | gcc-40de9f7604b99da9e0b9e3eed7df9a3c34c7e1da.tar.gz | |
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/cpplib.c')
| -rw-r--r-- | gcc/cpplib.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 5a927555468..7fba1f3e96b 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -438,7 +438,7 @@ static void run_directive (cpp_reader *pfile, int dir_no, const char *buf, size_t count) { cpp_push_buffer (pfile, (const uchar *) buf, count, - /* from_stage3 */ true, 1); + /* from_stage3 */ true); /* Disgusting hack. */ if (dir_no == T_PRAGMA) pfile->buffer->file = pfile->buffer->prev->file; @@ -1911,7 +1911,7 @@ cpp_set_callbacks (cpp_reader *pfile, cpp_callbacks *cb) is the responsibility of the caller. */ cpp_buffer * cpp_push_buffer (cpp_reader *pfile, const uchar *buffer, size_t len, - int from_stage3, int return_at_eof) + int from_stage3) { cpp_buffer *new = xobnew (&pfile->buffer_ob, cpp_buffer); @@ -1922,7 +1922,6 @@ cpp_push_buffer (cpp_reader *pfile, const uchar *buffer, size_t len, new->rlimit = buffer + len; new->from_stage3 = from_stage3; new->prev = pfile->buffer; - new->return_at_eof = return_at_eof; new->need_line = true; pfile->buffer = new; @@ -1960,9 +1959,7 @@ _cpp_pop_buffer (cpp_reader *pfile) { _cpp_pop_file_buffer (pfile, inc); - /* Don't generate a callback for popping the main file. */ - if (pfile->buffer) - _cpp_do_file_change (pfile, LC_LEAVE, 0, 0, 0); + _cpp_do_file_change (pfile, LC_LEAVE, 0, 0, 0); } } |