diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-09-07 13:55:11 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-09-07 15:32:14 +0100 |
| commit | 41737f12f99c9ea776f7658b93e5b03ffc8f120b (patch) | |
| tree | 76dd200a6f0e3fd8af87270ae1010985038c26a9 /rts/Schedule.c | |
| parent | a8179622f84bbd52e127a9596d2d4a918ca64e0c (diff) | |
| download | haskell-41737f12f99c9ea776f7658b93e5b03ffc8f120b.tar.gz | |
Deprecate lnat, and use StgWord instead
lnat was originally "long unsigned int" but we were using it when we
wanted a 64-bit type on a 64-bit machine. This broke on Windows x64,
where long == int == 32 bits. Using types of unspecified size is bad,
but what we really wanted was a type with N bits on an N-bit machine.
StgWord is exactly that.
lnat was mentioned in some APIs that clients might be using
(e.g. StackOverflowHook()), so we leave it defined but with a comment
to say that it's deprecated.
Diffstat (limited to 'rts/Schedule.c')
| -rw-r--r-- | rts/Schedule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/Schedule.c b/rts/Schedule.c index a8de843ea6..41f7f37f71 100644 --- a/rts/Schedule.c +++ b/rts/Schedule.c @@ -1107,9 +1107,9 @@ scheduleHandleHeapOverflow( Capability *cap, StgTSO *t ) if (cap->r.rHpAlloc > BLOCK_SIZE) { // if so, get one and push it on the front of the nursery. bdescr *bd; - lnat blocks; + W_ blocks; - blocks = (lnat)BLOCK_ROUND_UP(cap->r.rHpAlloc) / BLOCK_SIZE; + blocks = (W_)BLOCK_ROUND_UP(cap->r.rHpAlloc) / BLOCK_SIZE; if (blocks > BLOCKS_PER_MBLOCK) { barf("allocation of %ld bytes too large (GHC should have complained at compile-time)", (long)cap->r.rHpAlloc); |