projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1999-02-05 14:44:43 by simonm]
[ghc-hetmet.git]
/
ghc
/
rts
/
MBlock.c
diff --git
a/ghc/rts/MBlock.c
b/ghc/rts/MBlock.c
index
249493a
..
5e2fd24
100644
(file)
--- 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
*
* MegaBlock Allocator Interface. This file contains all the dirty
* architecture-dependent hackery required to get a chunk of aligned
@@
-31,7
+31,7
@@
#include <fcntl.h>
#endif
#include <fcntl.h>
#endif
-#if cygwin32_TARGET_OS
+#if HAVE_WINDOWS_H
#include <windows.h>
#endif
#include <windows.h>
#endif
@@
-52,6
+52,13
@@
/* guess */
#define ASK_FOR_MEM_AT 0x50000000
/* 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 */
#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
}
#ifndef _WIN32
-
void *
getMBlocks(nat n)
{
void *
getMBlocks(nat n)
{