diff options
| author | Sverker Eriksson <[email protected]> | 2013-10-15 18:02:38 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-10-15 18:02:38 +0200 |
| commit | 21270f86ab03d976ce3137c84d21e43ce6bc404b (patch) | |
| tree | 98843d726d270f8f65fa4371761829117d01239a /erts/emulator/beam/erl_alloc_util.h | |
| parent | fb43535f0dd910b9013bc0bddcdb0c27f0df53f0 (diff) | |
| parent | 356c1e9312a640ac211b6d5d4110372742acfcde (diff) | |
| download | otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.tar.gz otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.tar.bz2 otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.h')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h index 70ecf28172..222f137024 100644 --- a/erts/emulator/beam/erl_alloc_util.h +++ b/erts/emulator/beam/erl_alloc_util.h @@ -254,9 +254,9 @@ erts_aint32_t erts_alcu_fix_alloc_shrink(Allctr_t *, erts_aint32_t); # define MBC_ABLK_SZ_MASK (~FLG_MASK) #endif -#define MBC_ABLK_SZ(B) (ASSERT_EXPR(!is_sbc_blk(B)), (B)->bhdr & MBC_ABLK_SZ_MASK) -#define MBC_FBLK_SZ(B) (ASSERT_EXPR(!is_sbc_blk(B)), (B)->bhdr & MBC_FBLK_SZ_MASK) -#define SBC_BLK_SZ(B) (ASSERT_EXPR(is_sbc_blk(B)), (B)->bhdr & SBC_BLK_SZ_MASK) +#define MBC_ABLK_SZ(B) (ASSERT(!is_sbc_blk(B)), (B)->bhdr & MBC_ABLK_SZ_MASK) +#define MBC_FBLK_SZ(B) (ASSERT(!is_sbc_blk(B)), (B)->bhdr & MBC_FBLK_SZ_MASK) +#define SBC_BLK_SZ(B) (ASSERT(is_sbc_blk(B)), (B)->bhdr & SBC_BLK_SZ_MASK) #define CARRIER_SZ(C) \ ((C)->chdr & CARRIER_SZ_MASK) |