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/connect.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/connect.c')
| -rw-r--r-- | otherlibs/win32unix/connect.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/otherlibs/win32unix/connect.c b/otherlibs/win32unix/connect.c index 74e62252d..da7d09c71 100644 --- a/otherlibs/win32unix/connect.c +++ b/otherlibs/win32unix/connect.c @@ -22,16 +22,17 @@ CAMLprim value unix_connect(socket, address) value socket, address; { SOCKET s = Socket_val(socket); - int retcode; union sock_addr_union addr; socklen_param_type addr_len; + DWORD errcode = 0; get_sockaddr(address, &addr, &addr_len); enter_blocking_section(); - retcode = connect(s, &addr.s_gen, addr_len); + if (connect(s, &addr.s_gen, addr_len) == -1) + errcode = WSAGetLastError(); leave_blocking_section(); - if (retcode == -1) { - win32_maperr(WSAGetLastError()); + if (errcode) { + win32_maperr(errcode); uerror("connect", Nothing); } return Val_unit; |