From c01f3199cadb1827175855d57369824891181798 Mon Sep 17 00:00:00 2001 From: Wolfywolfy Date: Mon, 20 Nov 2023 10:24:30 -0300 Subject: [PATCH] Fix microsoft build --- lib/init.c | 4 ++++ lib/libsmb2.c | 4 ++++ lib/socket.c | 15 +++++++++++---- lib/sync.c | 8 +++++++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/lib/init.c b/lib/init.c index d66a4ce2..b9872c8c 100644 --- a/lib/init.c +++ b/lib/init.c @@ -25,6 +25,10 @@ #define _GNU_SOURCE #endif +#ifdef _WINDOWS +#define HAVE_SYS_SOCKET_H 1 +#endif + #ifdef HAVE_STDINT_H #include #endif diff --git a/lib/libsmb2.c b/lib/libsmb2.c index a978c3b9..dab8dfcb 100644 --- a/lib/libsmb2.c +++ b/lib/libsmb2.c @@ -25,6 +25,10 @@ #define _GNU_SOURCE #endif +#ifdef _WINDOWS +#define HAVE_SYS_SOCKET_H 1 +#endif + #ifdef HAVE_STDINT_H #include #endif diff --git a/lib/socket.c b/lib/socket.c index 9b467f71..c99fd37a 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -23,6 +23,11 @@ #define _GNU_SOURCE #endif +#ifdef _WINDOWS +#define HAVE_POLL_H 1 +#define HAVE_SYS_SOCKET_H 11 +#endif + #ifdef HAVE_NETDB_H #include #endif @@ -35,9 +40,11 @@ #include #endif -#if defined(HAVE_SYS_POLL_H) +#ifdef HAVE_SYS_POLL_H #include -#elif defined(HAVE_POLL_H) || defined(_WINDOWS) +#endif + +#ifdef HAVE_POLL_H #include #endif @@ -72,11 +79,11 @@ #include "portable-endian.h" #include -#if defined(HAVE_FCNTL_H) +#ifdef HAVE_FCNTL_H #include #endif -#if defined(HAVE_SYS_SOCKET_H) || defined(_WINDOWS) +#ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/lib/sync.c b/lib/sync.c index 6d0c2834..8b890441 100644 --- a/lib/sync.c +++ b/lib/sync.c @@ -23,6 +23,10 @@ #define _GNU_SOURCE #endif +#ifdef _WINDOWS +#define HAVE_POLL_H 1 +#endif + #ifdef HAVE_STDINT_H #include #endif @@ -35,7 +39,9 @@ #if defined(HAVE_SYS_POLL_H) #include -#elif defined(HAVE_POLL_H) || defined(_WINDOWS) +#endif + +#ifdef HAVE_POLL_H #include #endif