Anonymous avatar Anonymous committed 9cc8769

#5766: MSVC port broken following switch to winsock2.

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

Comments (0)

Files changed (9)

otherlibs/win32unix/accept.c

 #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)

otherlibs/win32unix/createprocess.c

 
 /* $Id$ */
 
+#include <mlvalues.h>
 #include "unixsupport.h"
 #include <windows.h>
-#include <mlvalues.h>
 #include <osdeps.h>
 
 static int win_has_console(void);

otherlibs/win32unix/link.c

 
 /* $Id$ */
 
-#include "unixsupport.h"
-#include <windows.h>
 #include <mlvalues.h>
 #include <fail.h>
+#include "unixsupport.h"
+#include <windows.h>
 
 typedef
 BOOL (WINAPI *tCreateHardLink)(

otherlibs/win32unix/select.c

 
 /* $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"

otherlibs/win32unix/socket.c

 
 #include <mlvalues.h>
 #include "unixsupport.h"
+#include <mswsock.h>   // for SO_OPENTYPE and SO_SYNCHRONOUS_NONALERT
 
 int socket_domain_table[] = {
   PF_UNIX, PF_INET,

otherlibs/win32unix/startup.c

 /*                                                                     */
 /***********************************************************************/
 
-#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;

otherlibs/win32unix/times.c

 /*                                                                     */
 /***********************************************************************/
 
-#include "unixsupport.h"
-#include <windows.h>
 #include <mlvalues.h>
 #include <alloc.h>
+#include "unixsupport.h"
+#include <windows.h>
 
 
 double to_sec(FILETIME ft) {

otherlibs/win32unix/winwait.c

 
 /* $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)
 {

otherlibs/win32unix/winworker.c

 
 /* $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,
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.