Meilleure distinction handle/socket. Ajout lockf. Revu rename.

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

1 files changed, 15 insertions, 1 deletions

diff --git a/otherlibs/win32unix/unixsupport.h b/otherlibs/win32unix/unixsupport.h
index c2c71e4bd..a14731f40 100644
--- a/otherlibs/win32unix/unixsupport.h
+++ b/otherlibs/win32unix/unixsupport.h
@@ -21,10 +21,24 @@
 #include "io.h"
 #include <direct.h>
 #include <process.h>
+#include <sys/types.h>
+#include <winsock.h>
 
-#define Handle_val(v) (*((HANDLE *) Data_custom_val(v)))
+struct filedescr {
+  union {
+    HANDLE handle;
+    SOCKET socket;
+  } fd;
+  enum { KIND_HANDLE, KIND_SOCKET } kind;
+};
 
+#define Handle_val(v) (((struct filedescr *) Data_custom_val(v))->fd.handle)
+#define Socket_val(v) (((struct filedescr *) Data_custom_val(v))->fd.socket)
+#define Descr_kind_val(v) (((struct filedescr *) Data_custom_val(v))->kind)
+
+extern value win_alloc_handle_or_socket(HANDLE);
 extern value win_alloc_handle(HANDLE);
+extern value win_alloc_socket(SOCKET);
 
 #define Nothing ((value) 0)