diff options
| author | Per Bothner <per@bothner.com> | 2004-02-20 12:02:27 -0800 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2004-02-20 12:02:27 -0800 |
| commit | 2ae5c785657f57c270c81d33776771bff8cfb0ad (patch) | |
| tree | c3e994ea6f3024e8a56160e4c47d32ca1a6a8820 /gcc | |
| parent | 7c4d376d4fa0dac8d3039a01c3c8b6fde1eb201d (diff) | |
| download | gcc-2ae5c785657f57c270c81d33776771bff8cfb0ad.zip gcc-2ae5c785657f57c270c81d33776771bff8cfb0ad.tar.gz gcc-2ae5c785657f57c270c81d33776771bff8cfb0ad.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/input.h | 2 | ||||
| -rw-r--r-- | gcc/toplev.c | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6d85b30..cfdba5b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2004-02-20 Per Bothner <per@bothner.com> + + * 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 <rth@redhat.com> * doc/invoke.texi: Add -Wvariadic-macros. diff --git a/gcc/input.h b/gcc/input.h index e1289e5..45fee91 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 def8c9f..071fb5d 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -40,6 +40,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA # include <sys/times.h> #endif +#include "line-map.h" #include "input.h" #include "tree.h" #include "rtl.h" |