Fix microsoft build

sahlberg · Nov 20, 2023 · c01f319 · c01f319
1 parent 3caf603
commit c01f319
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git 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 <stdint.h>
 #endif

diff --git 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 <stdint.h>
 #endif

diff --git 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 <netdb.h>
 #endif
@@ -35,9 +40,11 @@
 #include <netinet/in.h>
 #endif
 
-#if defined(HAVE_SYS_POLL_H)
+#ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>
-#elif defined(HAVE_POLL_H) || defined(_WINDOWS)
+#endif
+
+#ifdef HAVE_POLL_H
 #include <poll.h>
 #endif
 
@@ -72,11 +79,11 @@
 #include "portable-endian.h"
 #include <errno.h>
 
-#if defined(HAVE_FCNTL_H)
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 
-#if defined(HAVE_SYS_SOCKET_H) || defined(_WINDOWS)
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
 

diff --git 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 <stdint.h>
 #endif
@@ -35,7 +39,9 @@
 
 #if defined(HAVE_SYS_POLL_H)
 #include <sys/poll.h>
-#elif defined(HAVE_POLL_H) || defined(_WINDOWS)
+#endif
+
+#ifdef HAVE_POLL_H
 #include <poll.h>
 #endif