aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/dist.h
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-09-06 14:20:22 +0200
committerRickard Green <[email protected]>2018-09-06 14:20:22 +0200
commiteb538b5bff24ba3144f0646e1a24174e62218479 (patch)
treef7a18e02fd1cc4f8f5abb04a032afd0cd8095e76 /erts/emulator/beam/dist.h
parent6f44c787bd543dbf0f0d7a02baae175e822d5802 (diff)
parent30e5321740b96b3a8984611b6f821692716d0555 (diff)
downloadotp-eb538b5bff24ba3144f0646e1a24174e62218479.tar.gz
otp-eb538b5bff24ba3144f0646e1a24174e62218479.tar.bz2
otp-eb538b5bff24ba3144f0646e1a24174e62218479.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Update release notes Update version numbers kernel: Fix missing abort_connection in net_kernel Prevent inconsistent node lists Fix an endless rescheduling loop when a process is executing process_info(self(), ...)
Diffstat (limited to 'erts/emulator/beam/dist.h')
-rw-r--r--erts/emulator/beam/dist.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index dda2029a4c..30b4b35c20 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -399,5 +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);
+
#endif