diff options
| author | paul <paul> | 2005-11-24 12:51:24 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-11-24 12:51:24 +0000 |
| commit | b6026073584b855d47a8e2033d2aa3413a3394e9 (patch) | |
| tree | acc8812673bc85302da33007549e7828e2a23877 | |
| parent | 6e0f1b940dc281863ef9d9f3bd57676927b8603f (diff) | |
[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.
| -rw-r--r-- | lib/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/zebra.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 7e485635..e1f4118f 100644 --- 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 0aa98a4f..cf7998f2 100644 --- 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 |