#5766: MSVC port broken following switch to winsock2.

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

9 files changed, 15 insertions, 13 deletions

diff --git a/otherlibs/win32unix/accept.c b/otherlibs/win32unix/accept.c
index 48d028790..8782af3de 100644
--- a/otherlibs/win32unix/accept.c
+++ b/otherlibs/win32unix/accept.c
@@ -18,6 +18,7 @@
 #include <memory.h>
 #include <signals.h>
 #include "unixsupport.h"
+#include <mswsock.h>   // for SO_OPENTYPE and SO_SYNCHRONOUS_NONALERT
 #include "socketaddr.h"
 
 CAMLprim value unix_accept(sock)
diff --git a/otherlibs/win32unix/createprocess.c b/otherlibs/win32unix/createprocess.c
index 174890392..460a985c6 100644
--- a/otherlibs/win32unix/createprocess.c
+++ b/otherlibs/win32unix/createprocess.c
@@ -13,9 +13,9 @@
 
 /* $Id$ */
 
+#include <mlvalues.h>
 #include "unixsupport.h"
 #include <windows.h>
-#include <mlvalues.h>
 #include <osdeps.h>
 
 static int win_has_console(void);
diff --git a/otherlibs/win32unix/link.c b/otherlibs/win32unix/link.c
index d0fe02df1..11f6d37ca 100644
--- a/otherlibs/win32unix/link.c
+++ b/otherlibs/win32unix/link.c
@@ -13,10 +13,10 @@
 
 /* $Id$ */
 
-#include "unixsupport.h"
-#include <windows.h>
 #include <mlvalues.h>
 #include <fail.h>
+#include "unixsupport.h"
+#include <windows.h>
 
 typedef
 BOOL (WINAPI *tCreateHardLink)(
diff --git a/otherlibs/win32unix/select.c b/otherlibs/win32unix/select.c
index d0fd25b89..6d7961bb3 100644
--- a/otherlibs/win32unix/select.c
+++ b/otherlibs/win32unix/select.c
@@ -13,12 +13,12 @@
 
 /* $Id$ */
 
-#include "winworker.h"
 #include <mlvalues.h>
 #include <alloc.h>
 #include <memory.h>
 #include <fail.h>
 #include <signals.h>
+#include "winworker.h"
 #include <stdio.h>
 #include "windbug.h"
 #include "winlist.h"
diff --git a/otherlibs/win32unix/socket.c b/otherlibs/win32unix/socket.c
index 908ffb729..27fc55fcf 100644
--- a/otherlibs/win32unix/socket.c
+++ b/otherlibs/win32unix/socket.c
@@ -15,6 +15,7 @@
 
 #include <mlvalues.h>
 #include "unixsupport.h"
+#include <mswsock.h>   // for SO_OPENTYPE and SO_SYNCHRONOUS_NONALERT
 
 int socket_domain_table[] = {
   PF_UNIX, PF_INET,
diff --git a/otherlibs/win32unix/startup.c b/otherlibs/win32unix/startup.c
index ffbc4518e..65aedc6a8 100644
--- a/otherlibs/win32unix/startup.c
+++ b/otherlibs/win32unix/startup.c
@@ -11,11 +11,11 @@
 /*                                                                     */
 /***********************************************************************/
 
-#include "winworker.h"
 #include <stdio.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <mlvalues.h>
+#include "winworker.h"
 #include "windbug.h"
 
 value val_process_id;
diff --git a/otherlibs/win32unix/times.c b/otherlibs/win32unix/times.c
index 41ae985df..e6b5ab0ab 100644
--- a/otherlibs/win32unix/times.c
+++ b/otherlibs/win32unix/times.c
@@ -11,10 +11,10 @@
 /*                                                                     */
 /***********************************************************************/
 
-#include "unixsupport.h"
-#include <windows.h>
 #include <mlvalues.h>
 #include <alloc.h>
+#include "unixsupport.h"
+#include <windows.h>
 
 
 double to_sec(FILETIME ft) {
diff --git a/otherlibs/win32unix/winwait.c b/otherlibs/win32unix/winwait.c
index c81bc4f35..4eb0fda45 100644
--- a/otherlibs/win32unix/winwait.c
+++ b/otherlibs/win32unix/winwait.c
@@ -13,13 +13,13 @@
 
 /* $Id$ */
 
-#include "unixsupport.h"
-#include <windows.h>
 #include <mlvalues.h>
 #include <alloc.h>
 #include <memory.h>
-#include <sys/types.h>
 #include <signals.h>
+#include "unixsupport.h"
+#include <windows.h>
+#include <sys/types.h>
 
 static value alloc_process_status(HANDLE pid, int status)
 {
diff --git a/otherlibs/win32unix/winworker.c b/otherlibs/win32unix/winworker.c
index 38ebf6bc9..9abec6988 100644
--- a/otherlibs/win32unix/winworker.c
+++ b/otherlibs/win32unix/winworker.c
@@ -13,13 +13,13 @@
 
 /* $Id$ */
 
-#include "winworker.h"
-#include "winlist.h"
-#include "windbug.h"
 #include <mlvalues.h>
 #include <alloc.h>
 #include <memory.h>
 #include <signals.h>
+#include "winworker.h"
+#include "winlist.h"
+#include "windbug.h"
 
 typedef enum {
   WORKER_CMD_NONE = 0,