aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-03-08 17:19:59 +0100
committerSverker Eriksson <[email protected]>2016-03-08 17:19:59 +0100
commit25ea0fce81cd46a904b2aa95d982a9fd50a4a2c1 (patch)
treef96a18d6c072921ff7a02fc46524b7edaeee2923 /erts/emulator
parentab507dcee5917f147e1c4c307a29ad9508ccc85f (diff)
parente4fd76bdd9dd15547531947aaecf487385a6d796 (diff)
downloadotp-25ea0fce81cd46a904b2aa95d982a9fd50a4a2c1.tar.gz
otp-25ea0fce81cd46a904b2aa95d982a9fd50a4a2c1.tar.bz2
otp-25ea0fce81cd46a904b2aa95d982a9fd50a4a2c1.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_alloc_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index a4e56a6ff7..5e7dd7cce8 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -6273,7 +6273,7 @@ erts_alcu_test(UWord op, UWord a1, UWord a2)
case 0x019: return (UWord) PREV_BLK((Block_t *) a1);
case 0x01a: return (UWord) IS_MBC_FIRST_BLK((Allctr_t*)a1, (Block_t *) a2);
case 0x01b: return (UWord) sizeof(Unit_t);
- case 0x01c: return (unsigned long) BLK_TO_MBC((Block_t*) a1);
+ case 0x01c: return (UWord) BLK_TO_MBC((Block_t*) a1);
case 0x01d: ((Allctr_t*) a1)->add_mbc((Allctr_t*)a1, (Carrier_t*)a2); break;
case 0x01e: ((Allctr_t*) a1)->remove_mbc((Allctr_t*)a1, (Carrier_t*)a2); break;
#ifdef ERTS_SMP