diff options
author | Damien Doligez <damien.doligez-inria.fr> | 2013-06-04 14:34:10 +0000 |
---|---|---|
committer | Damien Doligez <damien.doligez-inria.fr> | 2013-06-04 14:34:10 +0000 |
commit | 3f8076d645155e526c2b7198677898910dc45766 (patch) | |
tree | 683489d238c07588c1cdd0e2bf660031aec90966 /otherlibs/win32unix/socket.c | |
parent | 207f9fb7f733c359f984446dd96f31a84f6ac939 (diff) |
PR#5325: re-do commit 11966, which was undone by mistake
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13743 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/win32unix/socket.c')
-rw-r--r-- | otherlibs/win32unix/socket.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/otherlibs/win32unix/socket.c b/otherlibs/win32unix/socket.c index ad8165b29..f6e7038ce 100644 --- a/otherlibs/win32unix/socket.c +++ b/otherlibs/win32unix/socket.c @@ -32,7 +32,6 @@ CAMLprim value unix_socket(domain, type, proto) value domain, type, proto; { SOCKET s; - int oldvalue, oldvaluelen, newvalue, retcode; #ifndef HAS_IPV6 /* IPv6 requires WinSock2, we must raise an error on PF_INET6 */ @@ -42,23 +41,9 @@ CAMLprim value unix_socket(domain, type, proto) } #endif - oldvaluelen = sizeof(oldvalue); - retcode = getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, - (char *) &oldvalue, &oldvaluelen); - if (retcode == 0) { - /* Set sockets to synchronous mode */ - newvalue = SO_SYNCHRONOUS_NONALERT; - setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, - (char *) &newvalue, sizeof(newvalue)); - } s = socket(socket_domain_table[Int_val(domain)], socket_type_table[Int_val(type)], Int_val(proto)); - if (retcode == 0) { - /* Restore initial mode */ - setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, - (char *) &oldvalue, oldvaluelen); - } if (s == INVALID_SOCKET) { win32_maperr(WSAGetLastError()); uerror("socket", Nothing); |