aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/external.c
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-02-12 16:17:25 +0100
committerBjörn Gustavsson <[email protected]>2010-03-10 14:25:40 +0100
commit37950725305fb8e911556608402cba6e4e17b87d (patch)
tree94ceada2198b3e7d823e5a45486fa00087a44296 /erts/emulator/beam/external.c
parentac0b3f0a64705717d21e4a3d84d91d9c44f3baf7 (diff)
downloadotp-37950725305fb8e911556608402cba6e4e17b87d.tar.gz
otp-37950725305fb8e911556608402cba6e4e17b87d.tar.bz2
otp-37950725305fb8e911556608402cba6e4e17b87d.zip
Fix further test-suite problems
Fix safe_mul in the loader, which caused failures in the bit syntax test cases. Fix yet another Uint in erl_alloc.h (ERTS_CACHE_LINE_SIZE) causing segmentation fault when we have many schedulers (why only in that situation?). Clean up erl_mseg (remove old code for the Linux 32-bit mmap flag). While at it, also remove compilation warnings.
Diffstat (limited to 'erts/emulator/beam/external.c')
-rw-r--r--erts/emulator/beam/external.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index badefb728d..f41b61d73d 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -1974,7 +1974,7 @@ dec_term(ErtsDistExternal *edep, Eterm** hpp, byte* ep, ErlOffHeap* off_heap, Et
register Eterm* hp = *hpp; /* Please don't take the address of hp */
Eterm* next = objp;
- *next = (Eterm) NULL;
+ *next = (Eterm) (UWord) NULL;
while (next != NULL) {
objp = next;