diff options
| author | Rickard Green <[email protected]> | 2013-06-04 11:51:54 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-06-04 11:51:54 +0200 |
| commit | 2a0c4c3f327eb0e8635e3a835b91c3819281bf28 (patch) | |
| tree | 4b8cc5e44a09b2f82842076768c3f47adeb15657 /erts/emulator/beam/global.h | |
| parent | b7081f310a8503855d10aeda35f4bc056be24bb3 (diff) | |
| parent | 0dc9af30c3dd673342f8b5f49b43cbdb8a1221c4 (diff) | |
| download | otp-2a0c4c3f327eb0e8635e3a835b91c3819281bf28.tar.gz otp-2a0c4c3f327eb0e8635e3a835b91c3819281bf28.tar.bz2 otp-2a0c4c3f327eb0e8635e3a835b91c3819281bf28.zip | |
Merge branch 'rickard/stale-driver-select/OTP-11084' into maint
* rickard/stale-driver-select/OTP-11084:
Fix crash when reporting stale driver select
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rwxr-xr-x | erts/emulator/beam/global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 26ed5f82c1..d5e727bcba 100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -723,10 +723,10 @@ void erts_raw_port_command(Port*, byte*, Uint); void driver_report_exit(ErlDrvPort, int); LineBuf* allocate_linebuf(int); int async_ready(Port *, void*); -ErtsPortNames *erts_get_port_names(Eterm); +ErtsPortNames *erts_get_port_names(Eterm, ErlDrvPort); void erts_free_port_names(ErtsPortNames *); Uint erts_port_ioq_size(Port *pp); -void erts_stale_drv_select(Eterm, ErlDrvEvent, int, int); +void erts_stale_drv_select(Eterm, ErlDrvPort, ErlDrvEvent, int, int); Port *erts_get_heart_port(void); |