X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMBlock.c;h=5e2fd2406307818b76b23d314aad52b60063330d;hb=813f822e959785f2d3e64f9569b96550e8381e79;hp=249493a94eb258db3731f60c0fc9ec8aa3ce3d9c;hpb=55d615e06c127f6a41a0923210f7853886729b26;p=ghc-hetmet.git diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c index 249493a..5e2fd24 100644 --- a/ghc/rts/MBlock.c +++ b/ghc/rts/MBlock.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: MBlock.c,v 1.5 1999/01/18 09:20:08 sof Exp $ + * $Id: MBlock.c,v 1.8 1999/01/26 10:41:20 sof Exp $ * * MegaBlock Allocator Interface. This file contains all the dirty * architecture-dependent hackery required to get a chunk of aligned @@ -31,7 +31,7 @@ #include #endif -#if cygwin32_TARGET_OS +#if HAVE_WINDOWS_H #include #endif @@ -52,6 +52,13 @@ /* guess */ #define ASK_FOR_MEM_AT 0x50000000 +#elif osf3_TARGET_OS +/* guess */ +#define ASK_FOR_MEM_AT 0x50000000 + +#elif _WIN32 +/* doesn't matter, we use a reserve/commit algorithm */ + #else #error Dont know where to get memory from on this architecture /* ToDo: memory locations on other architectures */ @@ -66,7 +73,6 @@ getMBlock(void) } #ifndef _WIN32 - void * getMBlocks(nat n) {