From: simonmar <unknown>
Date: Thu, 2 Sep 2004 12:45:25 +0000 (+0000)
Subject: [project @ 2004-09-02 12:45:25 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~1645
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=c7ce56fdbbd8de39eab09e55e93c2b6cabaf2c87

[project @ 2004-09-02 12:45:25 by simonmar]
Rearrange so that Regs.h include comes before inline function
definitions.  I'm guessing that newer versions of gcc are less picky
about this, which is why we hadn't noticed it.
---

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index 12051e0..924610c 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.63 2004/08/13 13:09:30 simonmar Exp $
+ * $Id: Stg.h,v 1.64 2004/09/02 12:45:25 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2004
  *
@@ -126,6 +126,26 @@ typedef StgWord StgWordArray[];
 #include "TailCalls.h"
 
 /* -----------------------------------------------------------------------------
+   Other Stg stuff...
+   -------------------------------------------------------------------------- */
+
+#include "StgDLL.h"
+#include "MachRegs.h"
+#include "Regs.h"
+#include "StgProf.h"  /* ToDo: separate out RTS-only stuff from here */
+
+#if IN_STG_CODE
+/*
+ * This is included later for RTS sources, after definitions of
+ * StgInfoTable, StgClosure and so on. 
+ */
+#include "StgMiscClosures.h"
+#endif
+
+/* RTS external interface */
+#include "RtsExternal.h"
+
+/* -----------------------------------------------------------------------------
    Moving Floats and Doubles
 
    ASSIGN_FLT is for assigning a float to memory (usually the
@@ -319,26 +339,6 @@ INLINE_HEADER StgInt64 PK_Int64(W_ p_src[])
 #endif
 
 /* -----------------------------------------------------------------------------
-   Other Stg stuff...
-   -------------------------------------------------------------------------- */
-
-#include "StgDLL.h"
-#include "MachRegs.h"
-#include "Regs.h"
-#include "StgProf.h"  /* ToDo: separate out RTS-only stuff from here */
-
-#if IN_STG_CODE
-/*
- * This is included later for RTS sources, after definitions of
- * StgInfoTable, StgClosure and so on. 
- */
-#include "StgMiscClosures.h"
-#endif
-
-/* RTS external interface */
-#include "RtsExternal.h"
-
-/* -----------------------------------------------------------------------------
    Split markers
    -------------------------------------------------------------------------- */