summaryrefslogtreecommitdiff
path: root/gcc/cpperror.c
diff options
context:
space:
mode:
authorPer Bothner <per@bothner.com>2004-01-19 21:30:18 -0800
committerPer Bothner <bothner@gcc.gnu.org>2004-01-19 21:30:18 -0800
commit50f59cd71061055cc039bbe44b5c955747719ebb (patch)
tree15fcd6b635123af68ed69ca87bf633fa01f46d8e /gcc/cpperror.c
parent9132fbb788b24bc4b03be723a42b16dd9f65e03f (diff)
downloadgcc-50f59cd71061055cc039bbe44b5c955747719ebb.tar.gz
Move cpp_reader's line_maps field to a shared global.
* cpphash.h (cpp_reader): Rename line_maps field to line_table and change the type to a pointer rather than a struct. * cppinit.c (cpp_push_main_field): Adjust accordingly. * cpplib.c (do_include_common, _cpp_do_file_change, cpp_get_callbacks): Likewise. * cppfiles.c (validate_pch): Likewise. * cppmacro.c (_cpp_warn_if_unused_macro, _cpp_builtin_macro_text): Likewise. * cpperror.c (print_location): Likewise. * cpplib.h (cpp_create_reader): New line_maps pointer parameter. * cppinit.c (cpp_create_reader): Handle new parameter. (cpp_destroy): Don't free line_maps - that's no longer our job. * input.h (line_table): New variable. * toplev.c (line_table): Declare variable. (general_init): Initialize line_table. * c-opts.c (c_common_init_options): Pass line_table to cpp_create_reader. * fix-header.c (read_scan_file): New local variable line_table. Initialize, and pass it to cpp_create_reader. * Makefile.in (LIBS, LIBDEPS): Add libcpp.a. (C_AND_OBJC_OBJS, fix-header): Remove redundant libcpp.a. From-SVN: r76198
Diffstat (limited to 'gcc/cpperror.c')
-rw-r--r--gcc/cpperror.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cpperror.c b/gcc/cpperror.c
index 61763cc1826..268d4ee53a8 100644
--- a/gcc/cpperror.c
+++ b/gcc/cpperror.c
@@ -45,8 +45,8 @@ print_location (cpp_reader *pfile, fileline line, unsigned int col)
const struct line_map *map;
unsigned int lin;
- map = linemap_lookup (&pfile->line_maps, line);
- linemap_print_containing_files (&pfile->line_maps, map);
+ map = linemap_lookup (pfile->line_table, line);
+ linemap_print_containing_files (pfile->line_table, map);
lin = SOURCE_LINE (map, line);
if (col == 0)