From 2ae5c785657f57c270c81d33776771bff8cfb0ad Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Fri, 20 Feb 2004 12:02:27 -0800 Subject: [PATCH] input.h: Don't #include line-map.h. * input.h: Don't #include line-map.h. It may cause link problems with undefined linemap_line_start when line-map.h is included but line-map.o is not linked, as currently happens with gengtype on compilers that don't support inline. * toplev.c: So we do have to explicitly #include line-map.h here. From-SVN: r78185 --- gcc/ChangeLog | 8 ++++++++ gcc/input.h | 2 -- gcc/toplev.c | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6d85b30951f..cfdba5b8733 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2004-02-20 Per Bothner + + * input.h: Don't #include line-map.h. It may cause link problems + with undefined linemap_line_start when line-map.h is included but + line-map.o is not linked, as currently happens with gengtype on + compilers that don't support inline. + * toplev.c: So we do have to explicitly #include line-map.h here. + 2004-02-20 Richard Henderson * doc/invoke.texi: Add -Wvariadic-macros. diff --git a/gcc/input.h b/gcc/input.h index e1289e56a7c..45fee91d040 100644 --- a/gcc/input.h +++ b/gcc/input.h @@ -22,8 +22,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #ifndef GCC_INPUT_H #define GCC_INPUT_H -#include "line-map.h" - extern struct line_maps line_table; /* The data structure used to record a location in a translation unit. */ diff --git a/gcc/toplev.c b/gcc/toplev.c index def8c9fae9f..071fb5d7e63 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -40,6 +40,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA # include #endif +#include "line-map.h" #include "input.h" #include "tree.h" #include "rtl.h" -- 2.30.2