diff options
author | Sverker Eriksson <[email protected]> | 2013-11-27 19:43:57 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2013-11-27 19:43:57 +0100 |
commit | 3e2a0ea59898ba214197b7a6f5df526d80697b7a (patch) | |
tree | abe4c522984b46fd1277e05c2ec0d7c1c1efdf3a /erts/emulator/beam/erl_binary.h | |
parent | d9ea7e090a4761f0ec42f727a67463f8b71f6544 (diff) | |
parent | 06188473247fd1edc873d82cf07886fa7e53e8cb (diff) | |
download | otp-3e2a0ea59898ba214197b7a6f5df526d80697b7a.tar.gz otp-3e2a0ea59898ba214197b7a6f5df526d80697b7a.tar.bz2 otp-3e2a0ea59898ba214197b7a6f5df526d80697b7a.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_binary.h')
-rw-r--r-- | erts/emulator/beam/erl_binary.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_binary.h b/erts/emulator/beam/erl_binary.h index f7dc20f5e6..819b19e566 100644 --- a/erts/emulator/beam/erl_binary.h +++ b/erts/emulator/beam/erl_binary.h @@ -225,7 +225,7 @@ erts_free_aligned_binary_bytes(byte* buf) ** These extra bytes where earlier (< R13B04) added by an alignment-bug ** in this code. Do we dare remove this in some major release (R14?) maybe? */ -#ifdef DEBUG +#if defined(DEBUG) || defined(VALGRIND) # define CHICKEN_PAD 0 #else # define CHICKEN_PAD (sizeof(void*) - 1) |