diff options
| author | Sverker Eriksson <[email protected]> | 2018-09-18 14:38:58 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-09-18 14:38:58 +0200 |
| commit | 990c25dc1265c0450ecb47ca73116ccb72a246c8 (patch) | |
| tree | 4cec06b76454f0bb9bbe44e7f5cf3778d1abaf86 /erts/emulator/beam/external.h | |
| parent | 59b49c6a5bc8053db97a27029ecf5245784b45fc (diff) | |
| parent | 06a5b038c1fb5f722b7f691488aaf18981f1344f (diff) | |
| download | otp-990c25dc1265c0450ecb47ca73116ccb72a246c8.tar.gz otp-990c25dc1265c0450ecb47ca73116ccb72a246c8.tar.bz2 otp-990c25dc1265c0450ecb47ca73116ccb72a246c8.zip | |
Merge branch 'sverker/erts/robustify-dist-entry-states/OTP-15297' into maint
* sverker/erts/robustify-dist-entry-states/OTP-15297:
erts: Refactor port dist_entry & conn_id into PRTSD
Remove ugly fail case macros
Consolidate distribution entry state transitions
erts: Fix bug in undocumented system_flag(scheduling_statistics)
Diffstat (limited to 'erts/emulator/beam/external.h')
| -rw-r--r-- | erts/emulator/beam/external.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/external.h b/erts/emulator/beam/external.h index bbd9b4bad2..edac177cc6 100644 --- a/erts/emulator/beam/external.h +++ b/erts/emulator/beam/external.h @@ -182,7 +182,7 @@ void erts_destroy_dist_ext_copy(ErtsDistExternal *); #define ERTS_PREP_DIST_EXT_CLOSED (1) int erts_prepare_dist_ext(ErtsDistExternal *, byte *, Uint, - DistEntry *, ErtsAtomCache *, Uint32 *); + DistEntry *, Uint32 conn_id, ErtsAtomCache *); Sint erts_decode_dist_ext_size(ErtsDistExternal *); Eterm erts_decode_dist_ext(ErtsHeapFactory* factory, ErtsDistExternal *); |