From: simonmar <unknown>
Date: Tue, 22 Jul 2003 13:23:44 +0000 (+0000)
Subject: [project @ 2003-07-22 13:23:44 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~666
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=261dd3171651ba3fa54b85213a70a3502052d416

[project @ 2003-07-22 13:23:44 by simonmar]
Oops, move include of stdlib.h after MachRegs.h, so that it comes
after register variable declarations.
---

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index 001ca55..b6bbcfa 100644
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.53 2003/07/21 15:05:54 simonmar Exp $
+ * $Id: Stg.h,v 1.54 2003/07/22 13:23:44 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -118,13 +118,6 @@ void _stgAssert (char *, unsigned int);
 #define doNothing() do { } while (0)
 
 /* -----------------------------------------------------------------------------
-   System headers
-   -------------------------------------------------------------------------- */
-
-// Needed so that we can use NULL
-#include <stdlib.h>
-
-/* -----------------------------------------------------------------------------
    Global type definitions
    -------------------------------------------------------------------------- */
 
@@ -196,6 +189,13 @@ typedef StgWord64       LW_;
 /* RTS public interface */
 #include "RtsAPI.h"
 
+/* System headers: stdlib.h is eeded so that we can use NULL.  It must
+ * come after MachRegs.h, because stdlib.h might define some inline
+ * functions which may only be defined after register variables have
+ * been declared.
+ */
+#include <stdlib.h>
+
 #ifdef SMP
 #include <pthread.h>
 #endif