From: simonmar <unknown>
Date: Wed, 8 Aug 2001 11:27:17 +0000 (+0000)
Subject: [project @ 2001-08-08 11:27:17 by simonmar]
X-Git-Tag: Approximately_9120_patches~1322
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=5a9bbffa7cd2ca8ff845c8ed780dd409fc7a7c66;p=ghc-hetmet.git

[project @ 2001-08-08 11:27:17 by simonmar]
oops, don't set the -M size to the -H size if -M is zero (i.e. turned
off).  Should fix the breakage encountered by last night's nightly build.
---

diff --git a/ghc/rts/Storage.c b/ghc/rts/Storage.c
index 0c5a815..c98d2bf 100644
--- a/ghc/rts/Storage.c
+++ b/ghc/rts/Storage.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Storage.c,v 1.44 2001/08/08 10:50:37 simonmar Exp $
+ * $Id: Storage.c,v 1.45 2001/08/08 11:27:17 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -59,7 +59,7 @@ static void *stgReallocForGMP (void *ptr, size_t old_size, size_t new_size);
 static void  stgDeallocForGMP (void *ptr, size_t size);
 
 void
-initStorage (void)
+initStorage( void )
 {
   nat g, s;
   step *stp;
@@ -82,7 +82,8 @@ initStorage (void)
   }
 #endif
 
-  if (RtsFlags.GcFlags.heapSizeSuggestion > 
+  if (RtsFlags.GcFlags.maxHeapSize != 0 &&
+      RtsFlags.GcFlags.heapSizeSuggestion > 
       RtsFlags.GcFlags.maxHeapSize) {
     RtsFlags.GcFlags.maxHeapSize = RtsFlags.GcFlags.heapSizeSuggestion;
   }