Merge pull request #508 from robUx4/raw-compat

Fix win32 build of installed package
sahlberg · Dec 16, 2024 · bcf5c75 · bcf5c75
2 parents 100e58a + f7cc1fe
commit bcf5c75
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/include/win32/win32_compat.h b/include/win32/win32_compat.h
@@ -150,14 +150,20 @@ struct pollfd {
 int     getpid(void);
 int     win32_inet_pton(int af, const char * src, void * dst);
 int     win32_poll(struct pollfd *fds, unsigned int nfsd, int timeout);
-int     win32_gettimeofday(struct timeval *tv, struct timezone *tz);
 #ifdef __MINGW32__
 # define win32_gettimeofday mingw_gettimeofday
+#else
+struct timezone
+{
+  int  tz_minuteswest; /* minutes W of Greenwich */
+  int  tz_dsttime;     /* type of dst correction */
+};
+int     win32_gettimeofday(struct timeval *tv, struct timezone *tz);
 #endif
 
 #define DllExport
 
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(_MSC_VER)
 char* libnfs_strndup(const char *s, size_t n);
 #define strndup libnfs_strndup
 #endif

diff --git a/lib/nfs_v4.c b/lib/nfs_v4.c
@@ -88,6 +88,10 @@
 #include <pwd.h>
 #endif
 
+#ifdef WIN32
+#include <win32/win32_compat.h>
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdarg.h>

diff --git a/win32/win32_compat.c b/win32/win32_compat.c
@@ -157,12 +157,6 @@ int win32_poll(struct pollfd *fds, unsigned int nfds, int timo)
 #endif
 
 #ifndef __MINGW32__
-struct timezone 
-{
-  int  tz_minuteswest; /* minutes W of Greenwich */
-  int  tz_dsttime;     /* type of dst correction */
-};
-
 int win32_gettimeofday(struct timeval *tv, struct timezone *tz)
 {
   FILETIME ft;