diff options
| author | Rickard Green <[email protected]> | 2013-05-16 17:43:19 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-05-16 17:43:19 +0200 |
| commit | 1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9 (patch) | |
| tree | 91dc0be43abc7b533f4850fa21b1ec1f9e9e5bb4 /erts/preloaded/src | |
| parent | 1ccd23bb49fddec2ac21859e518a1568cd494b93 (diff) | |
| parent | e550cd4842f4bd9d2555fceb47ec3064e0037372 (diff) | |
| download | otp-1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9.tar.gz otp-1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9.tar.bz2 otp-1932b1f4a9f4a8d083f9047b3ba1637dfea1c6d9.zip | |
Merge branch 'rickard/frmptr' into maint
* rickard/frmptr:
Add 'frmptr' emulator type
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/preloaded/src')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 020730efcb..7106c0a4fb 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2086,7 +2086,7 @@ tuple_to_list(_Tuple) -> ({allocator_sizes, Alloc}) -> [_] when %% More or less anything Alloc :: atom(); (build_type) -> opt | debug | purify | quantify | purecov | - gcov | valgrind | gprof | lcnt; + gcov | valgrind | gprof | lcnt | frmptr; (c_compiler_used) -> {atom(), term()}; (check_io) -> [_]; (compat_rel) -> integer(); |