[project @ 2001-11-25 03:56:39 by sof]

extend the scope of the doNothing() macro; can now be used in Stg headers

diff --git a/ghc/includes/Rts.h b/ghc/includes/Rts.h
index 264857b..32e48d2 100644 (file)
--- a/ghc/includes/Rts.h
+++ b/ghc/includes/Rts.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Rts.h,v 1.14 2001/10/29 11:33:37 simonmar Exp $
+ * $Id: Rts.h,v 1.15 2001/11/25 03:56:39 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -94,14 +94,6 @@ extern "C" {
    Useful macros and inline functions
    -------------------------------------------------------------------------- */
 
-/* 
- * Use this on the RHS of macros which expand to nothing
- * to make sure that the macro can be used in a context which
- * demands a non-empty statement.
- */
-
-#define doNothing() do { } while (0)
-
 #define stg_min(a,b) ({typeof(a) _a = (a), _b = (b); _a <= _b ? _a : _b; })
 #define stg_max(a,b) ({typeof(a) _a = (a), _b = (b); _a <= _b ? _b : _a; })
 

diff --git a/ghc/includes/Stg.h b/ghc/includes/Stg.h
index 9d302a7..2fbcfc8 100644 (file)
--- a/ghc/includes/Stg.h
+++ b/ghc/includes/Stg.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stg.h,v 1.40 2001/11/22 14:25:11 simonmar Exp $
+ * $Id: Stg.h,v 1.41 2001/11/25 03:56:39 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -103,6 +103,14 @@ void _stgAssert (char *, unsigned int);
            _stgAssert(__FILE__, __LINE__)
 #endif /* DEBUG */
 
+/* 
+ * Use this on the RHS of macros which expand to nothing
+ * to make sure that the macro can be used in a context which
+ * demands a non-empty statement.
+ */
+
+#define doNothing() do { } while (0)
+
 /* -----------------------------------------------------------------------------
    Global type definitions
    -------------------------------------------------------------------------- */