diff options
author | Björn-Egil Dahlberg <[email protected]> | 2012-03-19 16:35:04 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-19 16:35:04 +0100 |
commit | 252b055e7f05e2beb91d680635dec9a9b307b1b1 (patch) | |
tree | f9055b368bcc947ca331725d17ed153173317e11 /erts/emulator/beam | |
parent | 6dc3f61a6e2a635de31c2016e7bd8e6ff16533af (diff) | |
parent | 68ba8d70deb1549dd37a8325eea686c9908f926b (diff) | |
download | otp-252b055e7f05e2beb91d680635dec9a9b307b1b1.tar.gz otp-252b055e7f05e2beb91d680635dec9a9b307b1b1.tar.bz2 otp-252b055e7f05e2beb91d680635dec9a9b307b1b1.zip |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r-- | erts/emulator/beam/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index 3deb386621..603a6c47aa 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -744,7 +744,7 @@ driver_create_port(ErlDrvPort creator_port_ix, /* Creating port */ return (ErlDrvTermData) -1; /* pid does not exist */ } if ((port_num = get_free_port()) < 0) { - errno = ENFILE; + errno = SYSTEM_LIMIT; erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK); erts_smp_mtx_unlock(&erts_driver_list_lock); return (ErlDrvTermData) -1; |