2004-10-21 Andrew Pinski <pinskia@physics.uc.edu>

        PR c/17538
        * c-opts.c (push_command_line_include): Use the current file
        name instead of the main one.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89385 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ba84e86..f365083 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2004-10-21  Andrew Pinski  <pinskia@physics.uc.edu>
 
+       PR c/17538
+       * c-opts.c (push_command_line_include): Use the current file
+       name instead of the main one.
+
+2004-10-21  Andrew Pinski  <pinskia@physics.uc.edu>
+
        PR objc/17923
        * tree.c (staticp): A CONST_DECL has static storage if either
        TREE_STATIC or DECL_EXTERNAL is set.

diff --git a/gcc/c-opts.c b/gcc/c-opts.c
index 82932ce..146ef57 100644 (file)
--- a/gcc/c-opts.c
+++ b/gcc/c-opts.c
@@ -1353,7 +1353,7 @@ push_command_line_include (void)
       cpp_opts->warn_unused_macros = warn_unused_macros;
       /* Restore the line map from <command line>.  */
       if (!cpp_opts->preprocessed)
-       cpp_change_file (parse_in, LC_RENAME, main_input_filename);
+       cpp_change_file (parse_in, LC_RENAME, this_input_filename);
 
       /* Set this here so the client can change the option if it wishes,
         and after stacking the main file so we don't trace the main file.  */