From 2eaecbf3847120978cd61479d656d2381d533134 Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Thu, 22 Nov 2012 09:33:27 +0100 Subject: erts: Fix new header scheme for win64 --- erts/emulator/beam/erl_alloc_util.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h index 18ddad5f5b..9c15547574 100644 --- a/erts/emulator/beam/erl_alloc_util.h +++ b/erts/emulator/beam/erl_alloc_util.h @@ -222,11 +222,14 @@ erts_aint32_t erts_alcu_fix_alloc_shrink(Allctr_t *, erts_aint32_t); #define CARRIER_SZ_MASK UNIT_MASK -#ifdef ARCH_64 -# define MBC_ABLK_OFFSET_BITS 24 -#elif HAVE_SUPER_ALIGNED_MB_CARRIERS -# define MBC_ABLK_OFFSET_BITS 13 -#else +#if HAVE_ERTS_MSEG +# ifdef ARCH_64 +# define MBC_ABLK_OFFSET_BITS 24 +# elif HAVE_SUPER_ALIGNED_MB_CARRIERS +# define MBC_ABLK_OFFSET_BITS 13 +# endif +#endif +#ifndef MBC_ABLK_OFFSET_BITS # define MBC_ABLK_OFFSET_BITS 0 /* no carrier offset in block header */ #endif -- cgit v1.2.3