FFS upstream

source/adios2/toolkit/transport/file/FileHTTP.cpp

@@ -23,12 +23,16 @@
 #define INST_ADDRSTRLEN 50
 #else
 #include <netinet/in.h>
-#include <sys/socket.h>
-
+#ifdef __WIN32__
+// Not visual studio, but still windows
+#include <winsock2.h>
+#else
 #include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#endif
 #include <cstring>
 #include <netdb.h>
-#include <netinet/in.h>
 #include <unistd.h>
 #endif
 namespace adios2

source/adios2/toolkit/transport/file/FilePOSIX.cpp

@@ -22,7 +22,9 @@
 #include <thread>
 #ifndef _MSC_VER
 #include <unistd.h> // write, close, ftruncate
+#ifndef O_BINARY
 #define O_BINARY 0
+#endif
 #else
 #include <io.h>
 #define close _close

thirdparty/enet/enet/win32.c

@@ -9,6 +9,7 @@
 #include <windows.h>
 #include <mmsystem.h>
 #include <ws2ipdef.h>
+#include <ws2tcpip.h>
 
 static enet_uint32 timeBase = 0;
 

thirdparty/ffs/ffs/CMakeLists.txt

@@ -272,6 +272,7 @@ CHECK_INCLUDE_FILE(sys/un.h HAVE_SYS_UN_H)
 CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
 CHECK_INCLUDE_FILE(winsock.h HAVE_WINSOCK_H)
+CHECK_INCLUDE_FILE(winsock2.h HAVE_WINSOCK2_H)
 
 if(SIZEOF_SIZE_T EQUAL SIZEOF_INT)
   set(UIO_SIZE_T_TYPE "unsigned int")

thirdparty/ffs/ffs/config.h.cmake

@@ -99,6 +99,9 @@
 /* Define to 1 if you have the <winsock.h> header file. */
 #cmakedefine HAVE_WINSOCK_H
 
+/* Define to 1 if you have the <winsock2.h> header file. */
+#cmakedefine HAVE_WINSOCK2_H
+
 /* Define if you need struct iovec to be defined */
 #cmakedefine NEED_IOVEC_DEFINE
 

thirdparty/ffs/ffs/fm/nt_io.c

@@ -5,13 +5,15 @@
 #define HAVE_IOVEC_DEFINE
 #endif
 #define FD_SETSIZE 1024
+#ifdef HAVE_WINSOCK2_H
+#include "winsock2.h"
+#endif
 #include <windows.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <io.h>
-#include "ffs.h"
-#include "io_interface.h"
-#include "ffs_internal.h"
+#include "fm.h"
+#include "fm_internal.h"
 
 static int
 nt_file_read_func(conn, buffer, length, errno_p, result_p)

thirdparty/ffs/ffs/fm/unix_io.c

@@ -23,6 +23,9 @@
 #include <sys/uio.h>
 #define HAVE_IOVEC_DEFINE
 #endif
+#ifdef HAVE_WINSOCK2_H
+#include "winsock2.h"
+#endif
 #include <stdio.h>
 #include "fm.h"
 #include "fm_internal.h"