summaryrefslogtreecommitdiff
path: root/gcc/cppmacro.c
diff options
context:
space:
mode:
authorneil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-21 23:05:12 +0000
committerneil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-21 23:05:12 +0000
commit4087823d086e903795ecaff665e6ff3afb58c3dd (patch)
treee9c81016bacfbc22e38372b7b5b54d1c58bf8dc2 /gcc/cppmacro.c
parent438ac94c9b141e04a7b2512298120f5724b521ed (diff)
downloadgcc-4087823d086e903795ecaff665e6ff3afb58c3dd.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45085 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cppmacro.c')
-rw-r--r--gcc/cppmacro.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index bc12913d8a6..1ee91b7b305 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: