Replace MinGW with Windows to avoid ambiguities

[tinc] / src / dropin.h

diff --git a/src/dropin.h b/src/dropin.h
index 81d1d03..a1fb6c1 100644 (file)
--- a/src/dropin.h
+++ b/src/dropin.h
@@ -4,7 +4,7 @@
 /*
     dropin.h -- header file for dropin.c
     Copyright (C) 2000-2005 Ivo Timmermans,
-                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2022 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,29 +34,25 @@ extern int vasprintf(char **, const char *, va_list ap);
 extern int gettimeofday(struct timeval *, void *);
 #endif
 
-#ifndef HAVE_NANOSLEEP
-extern int nanosleep(const struct timespec *req, struct timespec *rem);
-#endif
-
 #ifndef timeradd
 #define timeradd(a, b, r) do {\
-       (r)->tv_sec = (a)->tv_sec + (b)->tv_sec;\
-       (r)->tv_usec = (a)->tv_usec + (b)->tv_usec;\
-       if((r)->tv_usec >= 1000000)\
-               (r)->tv_sec++, (r)->tv_usec -= 1000000;\
-} while (0)
+               (r)->tv_sec = (a)->tv_sec + (b)->tv_sec;\
+               (r)->tv_usec = (a)->tv_usec + (b)->tv_usec;\
+               if((r)->tv_usec >= 1000000)\
+                       (r)->tv_sec++, (r)->tv_usec -= 1000000;\
+       } while (0)
 #endif
 
 #ifndef timersub
 #define timersub(a, b, r) do {\
-       (r)->tv_sec = (a)->tv_sec - (b)->tv_sec;\
-       (r)->tv_usec = (a)->tv_usec - (b)->tv_usec;\
-       if((r)->tv_usec < 0)\
-               (r)->tv_sec--, (r)->tv_usec += 1000000;\
-} while (0)
+               (r)->tv_sec = (a)->tv_sec - (b)->tv_sec;\
+               (r)->tv_usec = (a)->tv_usec - (b)->tv_usec;\
+               if((r)->tv_usec < 0)\
+                       (r)->tv_sec--, (r)->tv_usec += 1000000;\
+       } while (0)
 #endif
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 #define mkdir(a, b) mkdir(a)
 #ifndef SHUT_RDWR
 #define SHUT_RDWR SD_BOTH
@@ -67,4 +63,38 @@ extern int nanosleep(const struct timespec *req, struct timespec *rem);
 #define EAI_SYSTEM 0
 #endif
 
+#ifndef MIN
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+
+#ifndef MAX
+#define MAX(a,b) (((a)>(b))?(a):(b))
 #endif
+
+#ifdef _MSC_VER
+
+#define __attribute(args)
+#define __attribute__(args)
+
+#define PATH_MAX MAX_PATH
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#define __const const
+
+typedef int mode_t;
+typedef int pid_t;
+typedef SSIZE_T ssize_t;
+
+static const int STDIN_FILENO = 0;
+static const int F_OK = 0;
+static const int X_OK = 0;
+static const int W_OK = 2;
+static const int R_OK = 4;
+
+#else // _MSC_VER
+
+#endif // _MSC_VER
+
+extern bool sleep_millis(unsigned int ms);
+
+#endif // TINC_DROPIN_H