diff options
| author | Björn Gustavsson <[email protected]> | 2018-08-15 12:37:49 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2018-08-15 12:37:49 +0200 |
| commit | 5a65083ec68d57c5ad2b267ad2d089947b3fd5a0 (patch) | |
| tree | 780c31e7f3bd5fccda931908b605a16e1139753f /erts/emulator | |
| parent | bbff5e508db9a5e9218e2902f30766fe53df36a8 (diff) | |
| parent | dacfafd97ed955b9c567f0efbc8553286360b0d2 (diff) | |
| download | otp-5a65083ec68d57c5ad2b267ad2d089947b3fd5a0.tar.gz otp-5a65083ec68d57c5ad2b267ad2d089947b3fd5a0.tar.bz2 otp-5a65083ec68d57c5ad2b267ad2d089947b3fd5a0.zip | |
Merge branch 'maint'
* maint:
Fix compiler crash when compiling double receives
erts: Delete fd from poll-set when closing fd_driver port
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/sys/unix/sys_drivers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/unix/sys_drivers.c b/erts/emulator/sys/unix/sys_drivers.c index d0498f0bd5..816bdea9c5 100644 --- a/erts/emulator/sys/unix/sys_drivers.c +++ b/erts/emulator/sys/unix/sys_drivers.c @@ -1000,7 +1000,7 @@ static void clear_fd_data(ErtsSysFdData *fdd) static void nbio_stop_fd(ErlDrvPort prt, ErtsSysFdData *fdd) { - driver_select(prt, abs(fdd->fd), DO_READ|DO_WRITE, 0); + driver_select(prt, abs(fdd->fd), ERL_DRV_USE_NO_CALLBACK|DO_READ|DO_WRITE, 0); clear_fd_data(fdd); SET_BLOCKING(abs(fdd->fd)); |