From bdc0fadee2dc9669818955486b4c3497016edda5 Mon Sep 17 00:00:00 2001
From: Damien Doligez <damien.doligez-inria.fr>
Date: Wed, 20 Jan 2010 16:26:46 +0000
Subject: merge changes from release/3.11.1 to release/3.11.2

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9540 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 otherlibs/win32unix/unixsupport.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'otherlibs/win32unix/unixsupport.c')

diff --git a/otherlibs/win32unix/unixsupport.c b/otherlibs/win32unix/unixsupport.c
index 24c4a9e45..6e32a39e7 100644
--- a/otherlibs/win32unix/unixsupport.c
+++ b/otherlibs/win32unix/unixsupport.c
@@ -65,6 +65,8 @@ value win_alloc_socket(SOCKET s)
   return res;
 }
 
+#if 0
+/* PR#4750: this function is no longer used */
 value win_alloc_handle_or_socket(HANDLE h)
 {
   value res = win_alloc_handle(h);
@@ -74,6 +76,7 @@ value win_alloc_handle_or_socket(HANDLE h)
     Descr_kind_val(res) = KIND_SOCKET;
   return res;
 }
+#endif
 
 /* Mapping of Windows error codes to POSIX error codes */
 
-- 
cgit v1.2.3-70-g09d2