aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2019-04-29 11:56:39 +0200
committerJohn Högberg <[email protected]>2019-04-29 11:56:39 +0200
commitf9b6d841c2fbc3af5496569baefb9017555c29a8 (patch)
tree19b7f9bdbd20ea09db95f36172787fba646b1786
parent87e748eda909272ab4c2178fdfe83bb74eef898b (diff)
downloadotp-f9b6d841c2fbc3af5496569baefb9017555c29a8.tar.gz
otp-f9b6d841c2fbc3af5496569baefb9017555c29a8.tar.bz2
otp-f9b6d841c2fbc3af5496569baefb9017555c29a8.zip
erts_alloc: Fix header packing on Win64
-rw-r--r--erts/emulator/beam/erl_alloc_util.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index b34916271e..b46b311c59 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -336,7 +336,9 @@ void erts_alcu_sched_spec_data_init(struct ErtsSchedulerData_ *esdp);
#if MBC_ABLK_OFFSET_BITS
/* The shift is reduced by 1 since the highest bit is used for a flag. */
# define MBC_ABLK_OFFSET_SHIFT (sizeof(UWord)*8 - 1 - MBC_ABLK_OFFSET_BITS)
-# define MBC_ABLK_OFFSET_MASK (((1ul << MBC_ABLK_OFFSET_BITS) - 1ul) << MBC_ABLK_OFFSET_SHIFT)
+# define MBC_ABLK_OFFSET_MASK \
+ (((UWORD_CONSTANT(1) << MBC_ABLK_OFFSET_BITS) - UWORD_CONSTANT(1)) \
+ << MBC_ABLK_OFFSET_SHIFT)
# define MBC_ABLK_SZ_MASK (~MBC_ABLK_OFFSET_MASK & ~BLK_FLG_MASK)
#else
# define MBC_ABLK_SZ_MASK (~BLK_FLG_MASK)