diff options
| author | Rickard Green <[email protected]> | 2018-09-12 14:41:05 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-09-12 14:41:05 +0200 |
| commit | 6d665a8296999822e4d516343d0e21ed62e70b37 (patch) | |
| tree | 924754f136b6e188163a275a5ffdcf6b7e69f3ff /erts/emulator/beam/dist.h | |
| parent | 72a9c61b043dd12b6871248b6b353b333b1bc30b (diff) | |
| parent | 333e4c5a1406cdeb9d1d5cf9bf4a4fadb232fca8 (diff) | |
| download | otp-6d665a8296999822e4d516343d0e21ed62e70b37.tar.gz otp-6d665a8296999822e4d516343d0e21ed62e70b37.tar.bz2 otp-6d665a8296999822e4d516343d0e21ed62e70b37.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Update release notes
Update version numbers
erts: Fix "Prevent inconsistent node lists" fix
Fix include-path regression caused by dd0a39c
Restore default SIGTERM behaviour for port programs
Diffstat (limited to 'erts/emulator/beam/dist.h')
| -rw-r--r-- | erts/emulator/beam/dist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h index 30b4b35c20..75cb865390 100644 --- a/erts/emulator/beam/dist.h +++ b/erts/emulator/beam/dist.h @@ -399,7 +399,7 @@ extern void erts_kill_dist_connection(DistEntry *dep, Uint32); extern Uint erts_dist_cache_size(void); -extern Sint erts_abort_connection(DistEntry *dep, Uint32 conn_id); +extern Sint erts_abort_connection_rwunlock(DistEntry *dep); #endif |