Make rtx, tree types type correct if the appropriate include files was not included

From-SVN: r20114

6 files changed, 32 insertions, 11 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6a45514..c306911 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+Thu May 28 09:36:39 1998  Michael Meissner  <meissner@cygnus.com>
+
+	* except.h (rtx): Define rtx type correctly if needed.
+	* function.h (rtx): Ditto.
+	(tree): Define tree type correctly if needed.
+
+	* c-pragma.c (toplevel): Include rtl.h.
+
+	* stor-layout.c (toplevel): Move include of rtl.h before
+	except.h.
+
+	* Makefile.in (c-pragma.o): Add except.h, rtl.h dependencies.
+	(tree.o): Add except.h dependency.
+	
 Wed May 27 22:02:40 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* reload1.c: Revert accidental checkin.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 2afcc22..7d9ef0e 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1259,8 +1259,8 @@ c-lex.o : c-lex.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) c-lex.h c-tree.h \
     toplev.h output.h
 c-aux-info.o : c-aux-info.c  $(CONFIG_H) system.h $(TREE_H) c-tree.h flags.h
 c-convert.o : c-convert.c $(CONFIG_H) system.h $(TREE_H) flags.h toplev.h
-c-pragma.o: c-pragma.c $(CONFIG_H) system.h $(TREE_H) except.h function.h \
-    defaults.h c-pragma.h toplev.h
+c-pragma.o: c-pragma.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) except.h \
+    function.h defaults.h c-pragma.h toplev.h
 c-iterate.o: c-iterate.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) c-tree.h \
     flags.h toplev.h 
 
@@ -1341,7 +1341,7 @@ prefix.o: prefix.c $(CONFIG_H) system.h gansidecl.h Makefile
 
 convert.o: convert.c $(CONFIG_H) $(TREE_H) flags.h convert.h toplev.h
 
-tree.o : tree.c $(CONFIG_H) system.h $(TREE_H) flags.h function.h toplev.h
+tree.o : tree.c $(CONFIG_H) system.h $(TREE_H) flags.h function.h toplev.h except.h
 print-tree.o : print-tree.c $(CONFIG_H) system.h $(TREE_H)
 stor-layout.o : stor-layout.c $(CONFIG_H) system.h $(TREE_H) flags.h \
    function.h expr.h insn-codes.h $(RTL_H) toplev.h except.h
diff --git a/gcc/c-pragma.c b/gcc/c-pragma.c
index 270cd20..3d01925 100644
--- a/gcc/c-pragma.c
+++ b/gcc/c-pragma.c
@@ -20,6 +20,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "system.h"
+#include "rtl.h"
 #include "tree.h"
 #include "except.h"
 #include "function.h"
diff --git a/gcc/except.h b/gcc/except.h
index 4917ab7..b96399e 100644
--- a/gcc/except.h
+++ b/gcc/except.h
@@ -19,9 +19,9 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-
-#ifndef GET_CODE
-#define rtx int *
+#if !defined(NULL_RTX) && !defined(rtx)
+typedef struct rtx_def *_except_rtx;
+#define rtx _except_rtx
 #endif
 
 #ifdef TREE_CODE
@@ -388,3 +388,7 @@ rtx expand_builtin_dwarf_reg_size	PROTO((tree, rtx));
 int in_same_eh_region                   PROTO((rtx, rtx));
 void free_insn_eh_region                PROTO((void));
 void init_insn_eh_region                PROTO((rtx, int));
+
+#ifdef rtx
+#undef rtx
+#endif
diff --git a/gcc/function.h b/gcc/function.h
index e31f484..59a149d 100644
--- a/gcc/function.h
+++ b/gcc/function.h
@@ -19,11 +19,13 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#ifndef NULL_TREE
-#define tree int *
+#if !defined(NULL_TREE) && !defined(tree)
+typedef union union_node *_function_tree;
+#define tree _function_tree
 #endif
-#ifndef GET_CODE
-#define rtx int *
+#if !defined(NULL_RTX) && !defined(rtx)
+typedef struct rtx_def *_function_rtx;
+#define rtx _function_rtx
 #endif
 
 struct var_refs_queue
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c
index 77561c9..043ad28 100644
--- a/gcc/stor-layout.c
+++ b/gcc/stor-layout.c
@@ -23,10 +23,10 @@ Boston, MA 02111-1307, USA.  */
 #include "system.h"
 
 #include "tree.h"
+#include "rtl.h"
 #include "flags.h"
 #include "except.h"
 #include "function.h"
-#include "rtl.h"
 #include "expr.h"
 #include "toplev.h"