diff options
| author | Lukas Larsson <[email protected]> | 2016-10-19 10:03:02 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-10-19 10:03:02 +0200 |
| commit | 8aed60e7ad127f1189f308b8f9926ac7b24532e3 (patch) | |
| tree | 7046b0ff9a397754b80a5d945aa578c4feda80aa /erts/preloaded/src | |
| parent | bce68cd6ecbdbf04ea6af367f0795d83826420d5 (diff) | |
| parent | 37384d3e68b3558e7cd48646a8acf4b74e6bc1c3 (diff) | |
| download | otp-8aed60e7ad127f1189f308b8f9926ac7b24532e3.tar.gz otp-8aed60e7ad127f1189f308b8f9926ac7b24532e3.tar.bz2 otp-8aed60e7ad127f1189f308b8f9926ac7b24532e3.zip | |
Merge branch 'gsantomaggio/erts/system_info_atoms/PR-1198/OTP-13976'
* gsantomaggio/erts/system_info_atoms/PR-1198/OTP-13976:
erts: Fix some system_info docs inconsistencies
Add system_info(atom_limit)
Diffstat (limited to 'erts/preloaded/src')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index a94719194c..da08ab383b 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2528,6 +2528,7 @@ tuple_to_list(_Tuple) -> Alloc :: atom(); ({allocator_sizes, Alloc}) -> [_] when %% More or less anything Alloc :: atom(); + (atom_limit) -> pos_integer(); (build_type) -> opt | debug | purify | quantify | purecov | gcov | valgrind | gprof | lcnt | frmptr; (c_compiler_used) -> {atom(), term()}; |