diff options
| author | Sverker Eriksson <[email protected]> | 2010-07-23 16:10:23 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2010-07-23 16:10:23 +0200 |
| commit | 6ec6250f8ad4fd13318d13e566602dccc9f6746f (patch) | |
| tree | 8ded6b9e6d078ebc8ce6e1ef1def3f176582857a /erts/emulator/beam/erl_message.h | |
| parent | 9267b2dc792c0a7632a0dcdc0a49510eb13e465e (diff) | |
| parent | 78bb45a531e9218e19e6faebd666355752fbfdb3 (diff) | |
| download | otp-6ec6250f8ad4fd13318d13e566602dccc9f6746f.tar.gz otp-6ec6250f8ad4fd13318d13e566602dccc9f6746f.tar.bz2 otp-6ec6250f8ad4fd13318d13e566602dccc9f6746f.zip | |
Merge branch 'sverker/halfword-heap-fixes/OTP-8745' into dev
* sverker/halfword-heap-fixes/OTP-8745:
Mending halfword heap emulator
Diffstat (limited to 'erts/emulator/beam/erl_message.h')
| -rw-r--r-- | erts/emulator/beam/erl_message.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_message.h b/erts/emulator/beam/erl_message.h index 890af2675c..55ea92860a 100644 --- a/erts/emulator/beam/erl_message.h +++ b/erts/emulator/beam/erl_message.h @@ -30,10 +30,10 @@ struct external_thing_; struct erl_off_heap_header { Eterm thing_word; - union { - Uint size; - void* ptr; - }u; + Uint size; +#if HALFWORD_HEAP + void* dummy_ptr_padding__; +#endif struct erl_off_heap_header* next; }; |