[project @ 2002-03-26 23:56:44 by sof]

TEXT_BEFORE_HEAP & cygwin: same as for mingw

diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c
index a8f34e8..bd30756 100644 (file)
--- a/ghc/rts/MBlock.c
+++ b/ghc/rts/MBlock.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: MBlock.c,v 1.26 2002/01/08 16:38:27 sof Exp $
+ * $Id: MBlock.c,v 1.27 2002/03/26 23:56:45 sof Exp $
  *
  * (c) The GHC Team 1998-1999
  *
@@ -48,7 +48,7 @@ getMBlock(void)
   return getMBlocks(1);
 }
 
-#ifndef _WIN32
+#if !defined(mingw32_TARGET_OS) && !defined(cygwin32_TARGET_OS)
 void *
 getMBlocks(nat n)
 {
@@ -95,7 +95,7 @@ getMBlocks(nat n)
   return ret;
 }
 
-#else /* _WIN32 */
+#else /* defined(mingw32_TARGET_OS) || defined(cygwin32_TARGET_OS) */
 
 /*
  On Win32 platforms we make use of the two-phased virtual memory API

diff --git a/ghc/rts/Storage.h b/ghc/rts/Storage.h
index 64b31f4..6ddb19a 100644 (file)
--- a/ghc/rts/Storage.h
+++ b/ghc/rts/Storage.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Storage.h,v 1.43 2002/03/26 10:43:15 simonmar Exp $
+ * $Id: Storage.h,v 1.44 2002/03/26 23:56:44 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -412,7 +412,7 @@ void printMutableList(generation *gen);
 
 
 #undef TEXT_BEFORE_HEAP
-#ifndef mingw32_TARGET_OS
+#if !defined(mingw32_TARGET_OS) && !defined(cygwin32_TARGET_OS)
 #define TEXT_BEFORE_HEAP 1
 #endif