[lib/zebra.h] fix Linux compile error

2005-11-24 Paul Jakma <paul.jakma@sun.com>

	* zebra.h: s/u_int/unsigned int/, u_int is a BSD type, defining
	  __USE_BSD on Linux pulls in further things from netinet/ip.h
	  which dont preprocess for some reason. There is no C99
	  shorthand type directly equivalent to u_int afaict, so don't
	  use it.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7e485635f4ffac5cf4532cb6b11a448811bfe9a2..e1f4118f3c7e4d31462504f777d97df525c048fd 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -3,6 +3,11 @@
        * privs.c: (zcaps2sys/solaris) remove unused variable.
          (zprivs_state_caps/solaris) Format string missing a
          specifier.
+       * zebra.h: s/u_int/unsigned int/, u_int is a BSD type, defining
+         __USE_BSD on Linux pulls in further things from netinet/ip.h
+         which dont preprocess for some reason. There is no C99
+         shorthand type directly equivalent to u_int afaict, so don't
+         use it.
 
 2005-11-14 Paul Jakma <paul.jakma@sun.com>
 

diff --git a/lib/zebra.h b/lib/zebra.h
index 0aa98a4f02ac3461688a1b9a8ef4a0f1257508f9..cf7998f23553e3f87373cf0b17f2782f6564807c 100644 (file)
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -415,9 +415,9 @@ struct in_pktinfo
    the route_types[] table in lib/log.c must be updated! */
 
 /* Map a route type to a string.  For example, ZEBRA_ROUTE_RIPNG -> "ripng". */
-extern const char *zebra_route_string(u_int route_type);
+extern const char *zebra_route_string(unsigned int route_type);
 /* Map a route type to a char.  For example, ZEBRA_ROUTE_RIPNG -> 'R'. */
-extern char zebra_route_char(u_int route_type);
+extern char zebra_route_char(unsigned int route_type);
 
 /* Zebra's family types. */
 #define ZEBRA_FAMILY_IPV4                1