diff options
| author | Sverker Eriksson <[email protected]> | 2018-03-13 17:26:38 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-03-13 17:26:38 +0100 |
| commit | 708b71548d9f0eee1676f7fca7c159a2d9a79abf (patch) | |
| tree | 0c545824094954c1f471e0b8473c8172b930441c /erts/preloaded | |
| parent | 9cc4c75fd00eeb0688765b4685d2e958fb38b39a (diff) | |
| parent | 5a1b9a836675b025eb1611f23ee9e2f5e4efa156 (diff) | |
| download | otp-708b71548d9f0eee1676f7fca7c159a2d9a79abf.tar.gz otp-708b71548d9f0eee1676f7fca7c159a2d9a79abf.tar.bz2 otp-708b71548d9f0eee1676f7fca7c159a2d9a79abf.zip | |
Merge branch 'sverker/dist-flags-consolidate'
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erts_internal.beam | bin | 13964 -> 14104 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erts_internal.erl | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam Binary files differindex 7d2edd9845..b79f734a6d 100644 --- a/erts/preloaded/ebin/erts_internal.beam +++ b/erts/preloaded/ebin/erts_internal.beam diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl index a083e9ac2f..a51c0c4c0e 100644 --- a/erts/preloaded/src/erts_internal.erl +++ b/erts/preloaded/src/erts_internal.erl @@ -63,6 +63,7 @@ -export([dist_ctrl_put_data/2]). +-export([get_dflags/0]). -export([new_connection/1]). -export([abort_connection/2]). @@ -510,6 +511,11 @@ dist_ctrl_put_data(DHandle, IoList) -> end. +-spec erts_internal:get_dflags() -> {erts_dflags, integer(), integer(), + integer(), integer(), integer()}. +get_dflags() -> + erlang:nif_error(undefined). + -spec erts_internal:new_connection(Node) -> ConnId when Node :: atom(), ConnId :: {integer(), erlang:dist_handle()}. |