2004-08-19 Paul Jakma <paul@dishone.st>

        * zebra.h: add MAX and MIN defines (eg for ospf6d)

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0e1960b17d76651f9854c6706ef246e049a3b9d2..514f47a1f698da88424d43e5b442954243f61285 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-19 Paul Jakma <paul@dishone.st>
+
+       * zebra.h: add MAX and MIN defines (eg for ospf6d)
+
 2004-08-19 Paul Jakma <paul@dishone.st>
 
        * sockopt.c: include sockopt.h

diff --git a/lib/zebra.h b/lib/zebra.h
index 89e07dea8707f51b747807a20931ce6e4d59cc13..6412655cf0f9dd045150ea99f4f564f4aa46392c 100644 (file)
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -245,6 +245,14 @@ struct in_pktinfo
 };
 #endif
 
+/* MAX / MIN are not commonly defined, but useful */
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif 
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 /* For old definition. */
 #ifndef IN6_ARE_ADDR_EQUAL
 #define IN6_ARE_ADDR_EQUAL IN6_IS_ADDR_EQUAL
@@ -269,7 +277,8 @@ struct in_pktinfo
 #define ZEBRA_IPV6_NEXTHOP_LOOKUP         16
 #define ZEBRA_IPV4_IMPORT_LOOKUP          17
 #define ZEBRA_IPV6_IMPORT_LOOKUP          18
-#define ZEBRA_MESSAGE_MAX                 19
+#define ZEBRA_INTERFACE_RENAME            19
+#define ZEBRA_MESSAGE_MAX                 20
 
 /* Zebra route's types. */
 #define ZEBRA_ROUTE_SYSTEM               0