diff options
| author | Renato Westphal <renatowestphal@gmail.com> | 2016-08-24 17:11:00 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-08-24 17:17:55 +0200 |
| commit | f43e655ed8d2fae1bf76aa32485cadf4de23be42 (patch) | |
| tree | c00f264ea0ccdf16b42fe8cce5bae18f917160d3 /bgpd/bgpd.h | |
| parent | Merge remote-tracking branch 'origin/cmaster' into cmaster-next (diff) | |
| download | frr-f43e655ed8d2fae1bf76aa32485cadf4de23be42.tar.xz frr-f43e655ed8d2fae1bf76aa32485cadf4de23be42.zip | |
bgpd: fix build on Solaris
* Solaris doesn't have u_int64_t, so use uint64_t instead. C99-style
fixed-width integers should always be preferred to improve portability;
* 's_addr' is a macro on Solaris, so we can't use it as a variable name.
Rename the 's_addr' variable to 'addr' in the
bgp_peer_conf_if_to_su_update_v4() function.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'bgpd/bgpd.h')
| -rw-r--r-- | bgpd/bgpd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index d9a68599c..e8827ca91 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -112,8 +112,8 @@ struct bgp_master #define BGP_OPT_CONFIG_CISCO (1 << 2) #define BGP_OPT_NO_LISTEN (1 << 3) - u_int64_t updgrp_idspace; - u_int64_t subgrp_idspace; + uint64_t updgrp_idspace; + uint64_t subgrp_idspace; /* timer to dampen route map changes */ struct thread *t_rmap_update; /* Handle route map updates */ @@ -518,7 +518,7 @@ struct peer /* BGP peer group. */ struct peer_group *group; - u_int64_t version[AFI_MAX][SAFI_MAX]; + uint64_t version[AFI_MAX][SAFI_MAX]; /* BGP peer_af structures, per configured AF on this peer */ struct peer_af *peer_af_array[BGP_AF_MAX]; |