diff options
author | Rickard Green <[email protected]> | 2010-08-10 13:51:03 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2010-08-10 13:51:03 +0200 |
commit | bc8817258be92596c255103da7c0e0c7e7c855c2 (patch) | |
tree | a8a2f1419006de482832f51f96487b47f6573a8e /erts/emulator/beam/external.h | |
parent | 59ee2a593090e7d53c97ceba63cbd300d1b9657e (diff) | |
parent | a4725cb01dcb9a846a73922bb7c14cd87f0e7803 (diff) | |
download | otp-bc8817258be92596c255103da7c0e0c7e7c855c2.tar.gz otp-bc8817258be92596c255103da7c0e0c7e7c855c2.tar.bz2 otp-bc8817258be92596c255103da7c0e0c7e7c855c2.zip |
Merge branch 'rickard/trailing-data-alignment/OTP-8754' into dev
* rickard/trailing-data-alignment/OTP-8754:
Align trailing message data for all types of structures
Diffstat (limited to 'erts/emulator/beam/external.h')
-rw-r--r-- | erts/emulator/beam/external.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/external.h b/erts/emulator/beam/external.h index db86b4d796..cee48bbeb0 100644 --- a/erts/emulator/beam/external.h +++ b/erts/emulator/beam/external.h @@ -211,7 +211,7 @@ ERTS_GLB_INLINE void * erts_dist_ext_trailer(ErtsDistExternal *edep) { void *res = (void *) (edep->ext_endp - + ERTS_WORD_ALIGN_PAD_SZ(edep->ext_endp)); + + ERTS_EXTRA_DATA_ALIGN_SZ(edep->ext_endp)); ASSERT((((UWord) res) % sizeof(Uint)) == 0); return res; } |