Move repeating MIN/MAX macros into dropin.h.

diff --git a/src/dropin.h b/src/dropin.h
index bc1951d389e1e679c370fcd0943e6e7088f112e7..d1919e1cc64bb280dcddc6856f29c3650f5c4946 100644 (file)
--- a/src/dropin.h
+++ b/src/dropin.h
@@ -69,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

diff --git a/src/net_packet.c b/src/net_packet.c
index 24ebdff84bee65c01a9b101944763adee8c47e05..63809aee613f3a86d770100e9facef01bf8c7873 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -55,10 +55,6 @@
 #include "route.h"
 #include "utils.h"
 
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
 /* The minimum size of a probe is 14 bytes, but since we normally use CBC mode
    encryption, we can add a few extra random bytes without increasing the
    resulting packet size. */

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 7994f00da03d351082972f9bc01f45204642fb22..284006bbf99d2b2c39fc0c4a9cc354d86d95dea2 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -29,10 +29,6 @@
 #include "protocol.h"
 #include "utils.h"
 
-#ifndef MIN
-#define MIN(x, y) (((x)<(y))?(x):(y))
-#endif
-
 int maxoutbufsize = 0;
 int mtu_info_interval = 5;
 int udp_info_interval = 5;

diff --git a/src/route.c b/src/route.c
index 69d0ba74a44be90fc376bfb436914c995dbd6998..79832dcad0f4c899bc3cbc936884707b08445fa0 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -54,10 +54,6 @@ static const size_t icmp6_size = sizeof(struct icmp6_hdr);
 static const size_t ns_size = sizeof(struct nd_neighbor_solicit);
 static const size_t opt_size = sizeof(struct nd_opt_hdr);
 
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
 static timeout_t age_subnets_timeout;
 
 /* RFC 1071 */

diff --git a/src/sptps_test.c b/src/sptps_test.c
index 3406a97ebd1e8db918d82cdc3d875763385cafc7..5e785b3af96e0e9dafb4f9a156da3b8939cbd6bb 100644 (file)
--- a/src/sptps_test.c
+++ b/src/sptps_test.c
@@ -34,10 +34,6 @@
 #include "sptps.h"
 #include "utils.h"
 
-#ifndef MAX
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)
 #endif