Enable and fix many extra warnings supported by GCC and Clang.

[tinc] / src / dropin.h

diff --git a/src/dropin.h b/src/dropin.h
index 938f30d..14783ff 100644 (file)
--- a/src/dropin.h
+++ b/src/dropin.h
@@ -1,7 +1,10 @@
+#ifndef TINC_DROPIN_H
+#define TINC_DROPIN_H
+
 /*
     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
@@ -18,8 +21,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __DROPIN_H__
-#define __DROPIN_H__
+#include "system.h"
 
 #ifndef HAVE_DAEMON
 extern int daemon(int, int);
@@ -34,26 +36,22 @@ 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
@@ -67,4 +65,12 @@ extern int nanosleep(const struct timespec *req, struct timespec *rem);
 #define EAI_SYSTEM 0
 #endif
 
-#endif /* __DROPIN_H__ */
+#ifndef MIN
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+
+#ifndef MAX
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
+#endif