diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2001-08-21 23:05:12 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2001-08-21 23:05:12 +0000 |
| commit | d8693c6fa425fecaf6570114f1cd69aaf3c08043 (patch) | |
| tree | e9c81016bacfbc22e38372b7b5b54d1c58bf8dc2 /gcc/cppmacro.c | |
| parent | 5993019d2058a2d4ff24b5990ff6d4ac9c8a3311 (diff) | |
| download | gcc-d8693c6fa425fecaf6570114f1cd69aaf3c08043.zip gcc-d8693c6fa425fecaf6570114f1cd69aaf3c08043.tar.gz gcc-d8693c6fa425fecaf6570114f1cd69aaf3c08043.tar.bz2 | |
cppfiles.c (stack_include_file): line-map.c now handles include depth.
* cppfiles.c (stack_include_file): line-map.c now handles include
depth.
(handle_missing_handler): Similarly.
(_cpp_execute_include): Similarly.
(_cpp_pop_file_buffer): Similarly.
* cpphash.h (struct cpp_reader): Remove system_include_depth,
buffer_stack_depth and include_depth.
* cpplib.c (do_include_common): line-map.c now handles include depth.
(cpp_push_buffer): Similarly.
(_cpp_pop_buffer): Similarly.
* cppmacro.c (builtin_macro): Update.
* line-map.c (init_line_maps): Set depth.
(add_line_map): Increment "used" earlier. Update and use the
include depth.
(trace_include): Use the include depth.
* line-map.h (struct line_maps): New member depth.
From-SVN: r45085
Diffstat (limited to 'gcc/cppmacro.c')
| -rw-r--r-- | gcc/cppmacro.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c index bc12913..1ee91b7 100644 --- a/gcc/cppmacro.c +++ b/gcc/cppmacro.c @@ -164,10 +164,10 @@ builtin_macro (pfile, token) break; case BT_INCLUDE_LEVEL: - /* pfile->include_depth counts the primary source as level 1, - but historically __INCLUDE_DEPTH__ has called the primary - source level 0. */ - make_number_token (pfile, token, pfile->include_depth - 1); + /* The line map depth counts the primary source as level 1, but + historically __INCLUDE_DEPTH__ has called the primary source + level 0. */ + make_number_token (pfile, token, pfile->line_maps.depth - 1); break; case BT_SPECLINE: |