diff options
| author | Olivier Dugeon <olivier.dugeon@orange.com> | 2017-01-16 15:12:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-16 15:12:55 +0100 |
| commit | ab0c9543a9f3337b1d99727a438d1293ef8b2956 (patch) | |
| tree | 529e6476fdcd48500bcca77ef77b3d68da23f1c6 /lib/prefix.h | |
| parent | 5731f9c9e57f5abfeff891fd036e9527bb14e023 (diff) | |
| parent | 602ba9bd8b118d3c1302e890010ca7c5d94e0ff5 (diff) | |
Merge pull request #68 from donaldsharp/cleanup
Cleanup
Diffstat (limited to 'lib/prefix.h')
| -rw-r--r-- | lib/prefix.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/prefix.h b/lib/prefix.h index 85488ccea7..5e4b1f9c83 100644 --- a/lib/prefix.h +++ b/lib/prefix.h @@ -74,9 +74,7 @@ struct prefix { u_char prefix; struct in_addr prefix4; -#ifdef HAVE_IPV6 struct in6_addr prefix6; -#endif /* HAVE_IPV6 */ struct { struct in_addr id; @@ -97,14 +95,12 @@ struct prefix_ipv4 }; /* IPv6 prefix structure. */ -#ifdef HAVE_IPV6 struct prefix_ipv6 { u_char family; u_char prefixlen; struct in6_addr prefix __attribute__ ((aligned (8))); }; -#endif /* HAVE_IPV6 */ struct prefix_ls { @@ -271,7 +267,6 @@ extern in_addr_t ipv4_broadcast_addr (in_addr_t hostaddr, int masklen); extern int netmask_str2prefix_str (const char *, const char *, char *); -#ifdef HAVE_IPV6 extern struct prefix_ipv6 *prefix_ipv6_new (void); extern void prefix_ipv6_free (struct prefix_ipv6 *); extern int str2prefix_ipv6 (const char *, struct prefix_ipv6 *); @@ -298,8 +293,6 @@ static inline int ipv6_martian (struct in6_addr *addr) return 0; } -#endif /* HAVE_IPV6 */ - extern int all_digit (const char *); /* NOTE: This routine expects the address argument in network byte order. */ |