From: Christian Schäfer <schaefer@ipd.info.uni-karlsruhe.de>
Date: Mon, 31 Jul 2000 16:17:41 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=6f68dc3a4550e38fd8d18401b5a5f7cf232dcd34;p=libfirm

*** empty log message ***

[r53]
---

diff --git a/Changes b/Changes
index 2eaa03663..ff0b3ecd1 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+  31.7.2000 Chris
+  Fixed a bug, caused by the recursive use in type.h and entity.h.
+  Deleted the _TYPE_TYPEDEF_ and inserted the _ENTITY_TYPEDEF_ instead.
 
   20.7.2000 Goetz
   Fixed bug in optimize(). Returned Null instead n if
diff --git a/ir/tr/entity.h b/ir/tr/entity.h
index 70dbf9b9a..8ae0fccbc 100644
--- a/ir/tr/entity.h
+++ b/ir/tr/entity.h
@@ -30,6 +30,7 @@
 # define _ENTITY_H_
 
 # include "ident.h"
+# include "type.h"
 
 /*******************************************************************/
 /** general                                                       **/
@@ -48,13 +49,20 @@ void init_entity (void);
 typedef struct ir_graph ir_graph;
 #endif
 
-#ifndef _TYPE_TYPEDEF_
-#define _TYPE_TYPEDEF_
-/* to resolve recursion between entity.h and irgraph.h */
-typedef union type type;
+#ifndef _ENTITY_TYPEDEF_
+#define _ENTITY_TYPEDEF_
+/* to resolve recursion between entity.h and type.h */
+typedef struct entity entity;
 #endif
 
-typedef struct entity entity;
+/*CS*/
+//#ifndef _TYPE_TYPEDEF_
+//#define _TYPE_TYPEDEF_
+/* to resolve recursion between entity.h and irgraph.h */
+//typedef union type type;
+//#endif
+
+//typedef struct entity entity;
 
 /* create a new entity */
 entity   *new_entity (type *owner, ident *name, type *type);
diff --git a/ir/tr/type.h b/ir/tr/type.h
index f6851a38b..23f4aedc0 100644
--- a/ir/tr/type.h
+++ b/ir/tr/type.h
@@ -183,14 +183,22 @@ or lowering phases.
 # include "common.h"
 # include "ident.h"
 # include "irmode.h"
-# include "entity.h"
+/*CS*/
+//# include "entity.h"
+
+#ifndef _ENTITY_TYPEDEF_
+#define _ENTITY_TYPEDEF_
+/* to resolve recursion between entity.h and type.h */
+typedef struct entity entity;
+#endif
 
 /* for recursive type definiton */
-#ifndef _TYPE_TYPEDEF_
-#define _TYPE_TYPEDEF_
+//#ifndef _TYPE_TYPEDEF_
+//#define _TYPE_TYPEDEF_
 /* to resolve recursion between entity.h and irgraph.h */
 typedef union type type;
-#endif
+//#endif
+
 
 /* visited flag to traverse the type information */
 extern unsigned long type_visited;