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/sys.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/sys.h')
| -rw-r--r-- | erts/emulator/beam/sys.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h index ca87d3d70f..eac38674e7 100644 --- a/erts/emulator/beam/sys.h +++ b/erts/emulator/beam/sys.h @@ -359,15 +359,8 @@ typedef unsigned char byte; #error 64-bit architecture, but no appropriate type to use for Uint64 and Sint64 found #endif -#if defined(ARCH_64) -# define ERTS_WORD_ALIGN_PAD_SZ(X) \ +# define ERTS_EXTRA_DATA_ALIGN_SZ(X) \ (((size_t) 8) - (((size_t) (X)) & ((size_t) 7))) -#elif defined(ARCH_32) -# define ERTS_WORD_ALIGN_PAD_SZ(X) \ - (((size_t) 4) - (((size_t) (X)) & ((size_t) 3))) -#else -#error "Not supported..." -#endif #include "erl_lock_check.h" #include "erl_smp.h" |