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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6d85b30951fc9fc66ca8883dd809ef9fb03c9bff..cfdba5b8733abcd1dab028c47874eecc780e5623 100644 (file)
--- 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 e1289e56a7c3f3821db7ee911eff739e7249338b..45fee91d040e0bfd60cf335a05d6ccf39e51a537 100644 (file)
--- 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 def8c9fae9f1d92499103e3c0595b797e3c2dc62..071fb5d7e63ca9c6557cf890e6e58cab958e9518 100644 (file)
--- 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"