diff options
| author | Rickard Green <[email protected]> | 2013-06-04 11:53:39 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-06-04 11:53:39 +0200 |
| commit | e00d6bbbabd7b76c050665fc417e81554a83e341 (patch) | |
| tree | 2881bc8f70c18ca4a36a89211a042b11c637e985 /erts/emulator/beam/global.h | |
| parent | e4f06fc54f6a8ae3bcdc5faa646a7bc720fe7479 (diff) | |
| parent | 2a0c4c3f327eb0e8635e3a835b91c3819281bf28 (diff) | |
| download | otp-e00d6bbbabd7b76c050665fc417e81554a83e341.tar.gz otp-e00d6bbbabd7b76c050665fc417e81554a83e341.tar.bz2 otp-e00d6bbbabd7b76c050665fc417e81554a83e341.zip | |
Merge branch 'maint'
* maint:
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 f7e4c81181..325e6658d9 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); |