summaryrefslogtreecommitdiff
path: root/otherlibs/win32unix/nonblock.c
diff options
context:
space:
mode:
authorJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2011-11-24 08:43:28 +0000
committerJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2011-11-24 08:43:28 +0000
commitbf63f916712f981f49ce62aa6ca0a6b1564af603 (patch)
tree451eba2212360b4fa5ab07845f95792efa80c8c3 /otherlibs/win32unix/nonblock.c
parentb67f7d43fbbf128fa71996b99df159a6aba7d88b (diff)
parent99451ca83e21bf89b23f230cebf45c77917e1106 (diff)
downloadocaml-gadts-devel.tar.gz
merge trunkgadts-devel
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/gadts-devel@11283 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/win32unix/nonblock.c')
-rwxr-xr-xotherlibs/win32unix/nonblock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/otherlibs/win32unix/nonblock.c b/otherlibs/win32unix/nonblock.c
index 8df1048d50..1f2550b058 100755
--- a/otherlibs/win32unix/nonblock.c
+++ b/otherlibs/win32unix/nonblock.c
@@ -26,7 +26,7 @@ CAMLprim value unix_set_nonblock(socket)
win32_maperr(WSAGetLastError());
uerror("unix_set_nonblock", Nothing);
}
- Flags_fd_val(socket) = Flags_fd_val(socket) | FLAGS_FD_IS_BLOCKING;
+ Flags_fd_val(socket) = Flags_fd_val(socket) & ~FLAGS_FD_IS_BLOCKING;
return Val_unit;
}
@@ -39,6 +39,6 @@ CAMLprim value unix_clear_nonblock(socket)
win32_maperr(WSAGetLastError());
uerror("unix_clear_nonblock", Nothing);
}
- Flags_fd_val(socket) = Flags_fd_val(socket) & ~FLAGS_FD_IS_BLOCKING;
+ Flags_fd_val(socket) = Flags_fd_val(socket) | FLAGS_FD_IS_BLOCKING;
return Val_unit;
}