Implementation du type file_descr par le type HANDLE de Win32. Court-circuite la libc de MSVC.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1700 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 8 insertions, 4 deletions

diff --git a/otherlibs/win32unix/sockopt.c b/otherlibs/win32unix/sockopt.c
index c858627a5..8ce59d8b2 100644
--- a/otherlibs/win32unix/sockopt.c
+++ b/otherlibs/win32unix/sockopt.c
@@ -25,9 +25,11 @@ value unix_getsockopt(socket, option) /* ML */
 {
   int optval, optsize;
   optsize = sizeof(optval);
-  if (getsockopt(_get_osfhandle(Int_val(socket)), SOL_SOCKET, 
-                 sockopt[Int_val(option)], (char *) &optval, &optsize) == -1)
+  if (getsockopt((SOCKET) Handle_val(socket), SOL_SOCKET, 
+                 sockopt[Int_val(option)], (char *) &optval, &optsize) == -1) {
+    _dosmaperr(WSAGetLastError());
     uerror("getsockopt", Nothing);
+  }
   return Val_int(optval);
 }
 
@@ -35,9 +37,11 @@ value unix_setsockopt(socket, option, status) /* ML */
      value socket, option, status;
 {
   int optval = Int_val(status);
-  if (setsockopt(_get_osfhandle(Int_val(socket)), SOL_SOCKET,
+  if (setsockopt((SOCKET) Handle_val(socket), SOL_SOCKET,
                  sockopt[Int_val(option)],
-                 (char *) &optval, sizeof(optval)) == -1)
+                 (char *) &optval, sizeof(optval)) == -1) {
+    _dosmaperr(WSAGetLastError());
     uerror("setsockopt", Nothing);
+  }
   return Val_unit;
 }