Comment author: @alainfrisch

Same for mingw 64 port.

Comment author: vouillon

The piece of code using SO_SYNCHRONOUS_NONALERT was removed by commit 11966 to fix issue #5325. It was merged back into trunk from branch 4.00 by commit 12784. (It was left in branch 4.00 as a workaround to issue #5578.)

If we want to keep this piece of code, we should include mswsock.h (diff below) rather than defining the symbols by hand.

Is it really necessary to include io.h (from directory byterun/, not the windows header file)? This does not seem to be required by the mingw port. Maybe we should instead include windows.h rather than winbase.h in unixsupport.h?

Index: otherlibs/win32unix/unixsupport.h

--- otherlibs/win32unix/unixsupport.h (révision 12952)
+++ otherlibs/win32unix/unixsupport.h (copie de travail)
@@ -21,6 +21,7 @@
#include <process.h>
#include <sys/types.h>
#include <winsock2.h>
+#include <mswsock.h>
#ifdef HAS_IPV6
#include <ws2tcpip.h>
#include <wspiapi.h>

Comment author: @alainfrisch

Thanks. Indeed, including mswsock.h is enough for the mingw port (tested with mingw 64 only). For the msvc port, we need to include something more to define HANDLE, otherwise we get:

cl /nologo -D_CRT_SECURE_NO_DEPRECATE /Ox /MD -I../../byterun -I../unix -c createprocess.c
createprocess.c
c:\cygwin\home\afrisch\ocaml\record-disambiguation\otherlibs\win32unix\unixsupport.h(47) : error C2061: syntax error : identifier 'win_alloc_handle'
....

Including windows.h instead of winbase.h in unixsupport.h (but not io.h) does not seem to work.

Comment author: vouillon

It's not 'HANDLE' which is not defined, but 'value'. Hence, mlvalues.h should be included before unixsupport.h in all C files. I'm to blame for this. I have attached a patch that should fix both issues.

With mingw, the Windows header file direct.h included from unixsupport.h includes file io.h (from directory byterun!), which itself includes mlvalues.h...

Comment author: @alainfrisch

Thanks for the patch, I've committed it to the trunk (rev 12956). mswsock.h was also required in socket.c. What about including it from unixsupport.h? Do you see any problem?

Comment author: vouillon

I don't think there is any problem with including it in unixsupport.h.

But maybe the right fix is to remove the getsockopt/setsockopt calls (reverting the corresponding part of commit 12784)?

Comment author: @alainfrisch

Well, as long as there is no nice solution implemented for #5578, I think getsockopt/setsockopt calls have to remain.

Comment author: @damiendoligez

Alain, does your commit of Jerome's patch fix the problem? Should we close this PR?

Comment author: @alainfrisch

I think so, but I haven't tried to compile under mingw 32 bit and msvc 64 bit.

Comment author: @damiendoligez

I've compiled under mingw 32 bit, with a small (unrelated) fix to otherlibs/labltk/lib/Makefile (r 12978).

Comment author: @damiendoligez

For the record, I have also compiled successfully with msvc 64-bit.