diff options
| author | Rickard Green <[email protected]> | 2018-09-12 14:42:55 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-09-12 14:42:55 +0200 |
| commit | d1ff3b3bec26a5f6bc354581d3056ee6277d39eb (patch) | |
| tree | 3ae998da0dafe93b1d84e57f7f7939a53ef22438 /erts/emulator/beam/dist.h | |
| parent | 9d22c4a02643f883e05d4e245c9724ead3c1ef11 (diff) | |
| parent | 6d665a8296999822e4d516343d0e21ed62e70b37 (diff) | |
| download | otp-d1ff3b3bec26a5f6bc354581d3056ee6277d39eb.tar.gz otp-d1ff3b3bec26a5f6bc354581d3056ee6277d39eb.tar.bz2 otp-d1ff3b3bec26a5f6bc354581d3056ee6277d39eb.zip | |
Merge branch 'maint'
* maint:
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 c8d0407456..e55daa7615 100644 --- a/erts/emulator/beam/dist.h +++ b/erts/emulator/beam/dist.h @@ -400,7 +400,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 |