diff options
| author | Rickard Green <[email protected]> | 2013-05-30 15:01:25 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-05-30 15:01:25 +0200 |
| commit | bedb203fc337ae588e329f058f5ba6ec250f25e6 (patch) | |
| tree | 9258c860506bc560a950d0dc00e137ef85e399c4 /erts/emulator/beam/global.h | |
| parent | 08bc75683f015bf7a542e30eb6ef88b18112fb22 (diff) | |
| parent | e794251f8e54d6697e1bcc360471fd76b20c7748 (diff) | |
| download | otp-bedb203fc337ae588e329f058f5ba6ec250f25e6.tar.gz otp-bedb203fc337ae588e329f058f5ba6ec250f25e6.tar.bz2 otp-bedb203fc337ae588e329f058f5ba6ec250f25e6.zip | |
Merge branch 'maint'
* maint:
Introduce a better id allocation algorithm for PTabs
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rwxr-xr-x | erts/emulator/beam/global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 012c1c7e6a..c900cdca39 100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -724,7 +724,7 @@ int erts_add_driver_entry(ErlDrvEntry *drv, DE_Handle *handle, int driver_list_l void erts_destroy_driver(erts_driver_t *drv); int erts_save_suspend_process_on_port(Port*, Process*); Port *erts_open_driver(erts_driver_t*, Eterm, char*, SysDriverOpts*, int *, int *); -void erts_init_io(int, int); +void erts_init_io(int, int, int); void erts_raw_port_command(Port*, byte*, Uint); void driver_report_exit(ErlDrvPort, int); LineBuf* allocate_linebuf(int); |