diff options
author | Sverker Eriksson <[email protected]> | 2010-11-24 18:28:36 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2010-11-24 18:28:36 +0100 |
commit | 58733c3ad0b1e60af8f44334998f95199d887ba1 (patch) | |
tree | 494b9794e9547b60370106b58e1ed34eb08bde53 /erts/emulator/beam/global.h | |
parent | e15ad4355d1fcbc73454ebc3ce8350a2c9f05069 (diff) | |
parent | 454335cd043561cc9fe874bc325c152a0727328b (diff) | |
download | otp-58733c3ad0b1e60af8f44334998f95199d887ba1.tar.gz otp-58733c3ad0b1e60af8f44334998f95199d887ba1.tar.bz2 otp-58733c3ad0b1e60af8f44334998f95199d887ba1.zip |
Merge branch 'sverker/ets_compress/OTP-8922' into dev
* sverker/ets_compress/OTP-8922:
ETS 'compressed' option.
Diffstat (limited to 'erts/emulator/beam/global.h')
-rw-r--r-- | erts/emulator/beam/global.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 12536f6cde..89c6625550 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -522,6 +522,7 @@ union erl_off_heap_ptr { struct erl_fun_thing* fun; struct external_thing_* ext; Eterm* ep; + void* voidp; }; /* arrays that get malloced at startup */ |