X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fdropin.h;h=d1919e1cc64bb280dcddc6856f29c3650f5c4946;hb=3b6d366005b6fc23c705b3156e365316f6ab776c;hp=81d1d03a1288f4a4d661f4b9473eb6b2bd571cf9;hpb=5822f817aa802c2c5a83e9d99a8ae78cb822799b;p=tinc

diff --git a/src/dropin.h b/src/dropin.h
index 81d1d03a..d1919e1c 100644
--- a/src/dropin.h
+++ b/src/dropin.h
@@ -21,6 +21,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "system.h"
+
 #ifndef HAVE_DAEMON
 extern int daemon(int, int);
 #endif
@@ -40,20 +42,20 @@ extern int nanosleep(const struct timespec *req, struct timespec *rem);
 
 #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
@@ -67,4 +69,12 @@ 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
+
 #endif