From bb74c963017da6f462498f75a5b09ff782e0137c Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Fri, 17 Aug 2001 22:23:49 +0000 Subject: cpperror.c (print_location): Don't take a file name; use the line map instead. * cpperror.c (print_location): Don't take a file name; use the line map instead. (_cpp_begin_message): Similarly. (cpp_ice, cpp_fatal, cpp_error, cpp_error_with_line, cpp_warning, cpp_warning_with_line, cpp_pedwarn, cpp_pedwarn_with_line): Update. (cpp_pedwarn_with_file_and_line): Remove. * cppfiles.c (stack_include_file): Update; set filename to stdin here when appropriate. * cpphash.h (struct cpp_buffer): Remove nominal_fname. (_cpp_begin_message): Don't take a file name. * cppinit.c: Add comment. * cpplex.c: Fix end-of-directive indicator. * cpplib.c: Don't include intl.h. (run_directive, do_diagnostic): Update. (do_line): Update to not use nominal_fname. (cpp_push_buffer): Don't take a filename. * cpplib.h (struct ht): Remove. (cpp_push_buffer): Don't take a filename. (cpp_pedwarn_with_file_and_line): Remove. * cppmacro.c (struct cpp_macro): Remove file. (builtin_macro): Update. (_cpp_create_definition): Update. * cppmain.c: Correct comment. * fix-header.c (read_scan_file): Update. From-SVN: r44986 --- gcc/cppinit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gcc/cppinit.c') diff --git a/gcc/cppinit.c b/gcc/cppinit.c index 63bcfdd..4a78a93 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -861,7 +861,7 @@ init_standard_includes (pfile) || (CPP_OPTION (pfile, cplusplus) && !CPP_OPTION (pfile, no_standard_cplusplus_includes))) { - char *str = xstrdup (update_path (p->fname, p->component)); + char *str = update_path (p->fname, p->component); append_include_chain (pfile, str, SYSTEM, p->cxx_aware); } } @@ -939,6 +939,9 @@ cpp_start_read (pfile, fname) if (!_cpp_read_file (pfile, fname)) return 0; + /* FIXME: we want to set up linemaps with _("") and + _("") somewhere round here. Harder than it looks. */ + /* If already preprocessed, don't install __LINE__, etc., and ignore command line definitions and assertions. Handle -U's, -D's and -A's in the order they were seen. */ -- cgit v1.1