From aab2f95439c28e2aa9358dbfe1ce7a15c774a766 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Fri, 4 Mar 2011 23:14:33 +0200 Subject: Windows cross-compile cleanup It should be sufficient to just try to see if socklen_t is defined. Next, on all platforms it would be int in all other platforms. And, there is no need to check for the type in monolitic environment like Windows, as it will be always the same. Currently it fails cross compile windows in mingw-w64 compiler, as winsock.h is as follows: """ /* define WINSOCK_API_LINKAGE and WSAAPI for less * diff output between winsock.h and winsock2.h, but * remember to undefine them at the end of file */ """ And the macro uses these macros which are internal winsock macros and should not be used anyway. Also, when did the autodefs.h went mandatory? Why is it in tap-win32/common.h while no constant is actually used? The use of WSA_IO_INCOMPLETE without including winsock2.h is invalid! Look at http://msdn.microsoft.com/en-us/library/aa921087.aspx Signed-off-by: Alon Bar-Lev Acked-by: James Yonan Signed-off-by: David Sommerseth --- tap-win32/common.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tap-win32') diff --git a/tap-win32/common.h b/tap-win32/common.h index 6785a33..bb8ab90 100755 --- a/tap-win32/common.h +++ b/tap-win32/common.h @@ -28,7 +28,9 @@ // common to both. //=============================================== +#ifndef HAVE_CONFIG_H #include "autodefs.h" +#endif //============= // TAP IOCTLs -- cgit