Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-7.6

http://hackage.haskell.org/trac/ghc/changeset/45f74125e8b40a759c674ad0f26106db74e7b8e9

>---------------------------------------------------------------

commit 45f74125e8b40a759c674ad0f26106db74e7b8e9
Author: Ian Lynagh <i...@well-typed.com>
Date:   Fri Nov 16 23:53:36 2012 +0000

    More OS X build fixes

>---------------------------------------------------------------

 rts/Linker.c   |    2 +-
 rts/RtsFlags.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index c43df68..52fcecb 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -1893,7 +1893,7 @@ mmap_again:
                     MAP_PRIVATE|TRY_MAP_32BIT|fixed|flags, fd, 0);
 
    if (result == MAP_FAILED) {
-       sysErrorBelch("mmap %" FMT_SizeT " bytes at %p",(W_)size,map_addr);
+       sysErrorBelch("mmap %" FMT_Word " bytes at %p",(W_)size,map_addr);
        errorBelch("Try specifying an address with +RTS -xm<addr> -RTS");
        stg_exit(EXIT_FAILURE);
    }
diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index bb260c2..3f38c8a 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -1553,7 +1553,7 @@ decodeSize(const char *flag, nat offset, StgWord64 min, 
StgWord64 max)
     if (m < 0 || val < min || val > max) {
         // printf doesn't like 64-bit format specs on Windows
         // apparently, so fall back to unsigned long.
-        errorBelch("error in RTS option %s: size outside allowed range (%" 
FMT_SizeT " - %" FMT_SizeT ")", flag, (W_)min, (W_)max);
+        errorBelch("error in RTS option %s: size outside allowed range (%" 
FMT_Word " - %" FMT_Word ")", flag, (W_)min, (W_)max);
         stg_exit(EXIT_FAILURE);
     }
 



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to