From 612755bd52b4d422de179f4c0ca30b8afea336c1 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Fri, 5 Feb 1999 12:41:32 +0000
Subject: [PATCH] [project @ 1999-02-05 12:41:31 by sof] don't include structs
that are known to be empty within StgInfoTable and StgHeader. Shouldn't be a
problem - but egcs-1.1.1 doesn't handle them correctly.
---
ghc/includes/Closures.h | 8 +++++++-
ghc/includes/InfoTables.h | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ghc/includes/Closures.h b/ghc/includes/Closures.h
index e2e293269fd8..35578270461f 100644
--- a/ghc/includes/Closures.h
+++ b/ghc/includes/Closures.h
@@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------------
- * $Id: Closures.h,v 1.5 1999/01/26 11:12:55 simonm Exp $
+ * $Id: Closures.h,v 1.6 1999/02/05 12:41:31 sof Exp $
*
* Closures
*
@@ -91,9 +91,15 @@ typedef struct {
typedef struct {
const struct _StgInfoTable* info;
+#ifdef PROFILING
StgProfHeader prof;
+#endif
+#ifdef GRAN
StgGranHeader par;
+#endif
+#ifdef TICKY
StgTickyHeader ticky;
+#endif
} StgHeader;
#define FIXED_HS (sizeof(StgHeader))
diff --git a/ghc/includes/InfoTables.h b/ghc/includes/InfoTables.h
index 9c71d6172db5..3f1cd51f6039 100644
--- a/ghc/includes/InfoTables.h
+++ b/ghc/includes/InfoTables.h
@@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------------
- * $Id: InfoTables.h,v 1.7 1999/01/26 16:16:21 simonm Exp $
+ * $Id: InfoTables.h,v 1.8 1999/02/05 12:41:32 sof Exp $
*
* Info Tables
*
@@ -300,9 +300,15 @@ typedef StgClosure* StgSRT[];
typedef struct _StgInfoTable {
StgSRT *srt; /* pointer to the SRT table */
+#ifdef PAR
StgParInfo par;
+#endif
+#ifdef PROFILING
StgProfInfo prof;
+#endif
+#ifdef DEBUG_CLOSURE
StgDebugInfo debug;
+#endif
StgClosureInfo layout; /* closure layout info (pointer-sized) */
#if SIZEOF_VOID_P == 8
StgNat16 flags; /* } */
--
GitLab