diff options
| author | Patrik Nyblom <[email protected]> | 2013-04-05 18:51:50 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-04-05 18:51:50 +0200 |
| commit | b9ef8bac23fa0421765afe3073f430a1f0d92260 (patch) | |
| tree | 94428e0a154e4c7c835d56b92fb0e42eda19b12c /erts/emulator/beam/erl_ptab.h | |
| parent | b269e15eea9232205a371d6b10c50628d836b661 (diff) | |
| parent | 7b31cdb80624567568474d79bff07e053457a450 (diff) | |
| download | otp-b9ef8bac23fa0421765afe3073f430a1f0d92260.tar.gz otp-b9ef8bac23fa0421765afe3073f430a1f0d92260.tar.bz2 otp-b9ef8bac23fa0421765afe3073f430a1f0d92260.zip | |
Merge branch 'maint-r16' into maint
Conflicts:
erts/vsn.mk
Diffstat (limited to 'erts/emulator/beam/erl_ptab.h')
| -rw-r--r-- | erts/emulator/beam/erl_ptab.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_ptab.h b/erts/emulator/beam/erl_ptab.h index 8a130f42a3..7fa1251900 100644 --- a/erts/emulator/beam/erl_ptab.h +++ b/erts/emulator/beam/erl_ptab.h @@ -109,6 +109,7 @@ typedef struct { ErtsPTabElementCommon *invalid_element; Eterm invalid_data; void (*release_element)(void *); + UWord element_size; } ErtsPTabReadOnlyData; typedef struct { @@ -177,6 +178,7 @@ void erts_ptab_init_table(ErtsPTab *ptab, void (*release_element)(void *), ErtsPTabElementCommon *invalid_element, int size, + UWord element_size, char *name); int erts_ptab_new_element(ErtsPTab *ptab, ErtsPTabElementCommon *ptab_el, |