diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-04 07:32:04 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-12-04 07:32:04 +0000 |
| commit | fd944c82b484fee0514fefed73ce1622127976cc (patch) | |
| tree | 2ee77fc01b58627c217cdfa65bb2e8134086c70b /gcc/cpplib.c | |
| parent | 3d75d43c65cad1c53dd9b0321ff7e166c00d1d32 (diff) | |
| download | gcc-fd944c82b484fee0514fefed73ce1622127976cc.tar.gz | |
* cppfiles.c (cpp_make_system_header): Take 2 booleans,
and operate on current buffer.
(cpp_read_file): Rename _cpp_read_file.
* cpplib.c (do_line, do_pragma_system_header): Update calls to
cpp_make_system_header.
* fix-header.c: Similarly.
* cpphash.h (_cpp_read_file): Move from...
* cpplib.h: ... here.
* cppinit.c (do_includes, cpp_start_read): Update appropriately.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37989 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cpplib.c')
| -rw-r--r-- | gcc/cpplib.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c index d4b243fc308..197faaf3c18 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -771,23 +771,23 @@ do_line (pfile) if (action_number == 1) { reason = FC_ENTER; - cpp_make_system_header (pfile, buffer, 0); + cpp_make_system_header (pfile, 0, 0); read_line_number (pfile, &action_number); } else if (action_number == 2) { reason = FC_LEAVE; - cpp_make_system_header (pfile, buffer, 0); + cpp_make_system_header (pfile, 0, 0); read_line_number (pfile, &action_number); } if (action_number == 3) { - cpp_make_system_header (pfile, buffer, 1); + cpp_make_system_header (pfile, 1, 0); read_line_number (pfile, &action_number); } if (action_number == 4) { - cpp_make_system_header (pfile, buffer, 2); + cpp_make_system_header (pfile, 1, 1); read_line_number (pfile, &action_number); } } @@ -1100,11 +1100,12 @@ static void do_pragma_system_header (pfile) cpp_reader *pfile; { - cpp_buffer *ip = CPP_BUFFER (pfile); - if (CPP_PREV_BUFFER (ip) == NULL) - cpp_warning (pfile, "#pragma system_header outside include file"); + cpp_buffer *buffer = pfile->buffer; + + if (buffer->prev == 0) + cpp_warning (pfile, "#pragma system_header ignored outside include file"); else - cpp_make_system_header (pfile, ip, 1); + cpp_make_system_header (pfile, 1, 0); check_eol (pfile); } |