diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2006-10-18 08:17:32 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2006-10-18 08:17:32 +0000 |
| commit | 741d1e70781e74a523e3a142ec6176422671c8c1 (patch) | |
| tree | bb654e809b7a5ab6f82a35f3f9bcc4fe3e01cf89 /otherlibs/win32unix/select.c | |
| parent | b74f4b01e790de7c237a74ca12e2972443c81c5b (diff) | |
PR#4097: Tentative fix, to be tested
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7695 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/win32unix/select.c')
| -rw-r--r-- | otherlibs/win32unix/select.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/otherlibs/win32unix/select.c b/otherlibs/win32unix/select.c index 4fa8e788b..a7b68217e 100644 --- a/otherlibs/win32unix/select.c +++ b/otherlibs/win32unix/select.c @@ -54,6 +54,7 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value int retcode; value res; value read_list = Val_unit, write_list = Val_unit, except_list = Val_unit; + DWORD errcode = 0; Begin_roots3 (readfds, writefds, exceptfds) Begin_roots3 (read_list, write_list, except_list) @@ -79,10 +80,11 @@ CAMLprim value unix_select(value readfds, value writefds, value exceptfds, value tvp = &tv; } enter_blocking_section(); - retcode = select(FD_SETSIZE, &read, &write, &except, tvp); + if (select(FD_SETSIZE, &read, &write, &except, tvp) == -1) + errcode = WSAGetLastError(); leave_blocking_section(); - if (retcode == -1) { - win32_maperr(WSAGetLastError()); + if (errcode) { + win32_maperr(errcode); uerror("select", Nothing); } read_list = fdset_to_fdlist(readfds, &read); |