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 0e1960b..514f47a 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,9 @@
 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
 	  rename some of the _pktinfo_ functions to _ifindex, where that is
 	  their purpose.
diff --git a/lib/zebra.h b/lib/zebra.h
index 89e07de..6412655 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -245,6 +245,14 @@
 };
 #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 @@
 #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