diff options
| author | Micael Karlberg <[email protected]> | 2019-07-30 17:12:04 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2019-07-30 17:13:43 +0200 |
| commit | d2215d7950d518530c563f253268e5bec93bbbe4 (patch) | |
| tree | f20b072813725d2f1e59d552c7967c6650f45368 | |
| parent | 35484c424aecc2fb0d91cab9616a7ff91b3d1d42 (diff) | |
| download | otp-d2215d7950d518530c563f253268e5bec93bbbe4.tar.gz otp-d2215d7950d518530c563f253268e5bec93bbbe4.tar.bz2 otp-d2215d7950d518530c563f253268e5bec93bbbe4.zip | |
[esock] Post merge fix
| -rw-r--r-- | erts/emulator/nifs/common/socket_nif.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c index 474ba518ed..881a9c7ccd 100644 --- a/erts/emulator/nifs/common/socket_nif.c +++ b/erts/emulator/nifs/common/socket_nif.c @@ -1124,7 +1124,6 @@ static ERL_NIF_TERM esock_accept_accepting_other(ErlNifEnv* env, ERL_NIF_TERM ref, ErlNifPid caller); static ERL_NIF_TERM esock_accept_busy_retry(ErlNifEnv* env, ->>>>>>> maint ESockDescriptor* descP, ERL_NIF_TERM sockRef, ERL_NIF_TERM accRef, |