diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2015-05-27 22:15:37 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2015-05-27 22:16:32 +0200 |
| commit | 05a69d2f3833c285b399558ba7ab4a57f194a88d (patch) | |
| tree | 5c897f789ec473225d03017bd57e6809d240e7fc /lib | |
| parent | 72855b16b72e9ad2c7eb0c0bfd8f5985f779608f (diff) | |
| download | quagga-05a69d2f3833c285b399558ba7ab4a57f194a88d.tar.bz2 quagga-05a69d2f3833c285b399558ba7ab4a57f194a88d.tar.xz | |
Revert "lib: wrong #define used for IPV6_MINHOPCOUNT"
This reverts commit 54b88cac24f335414caa875b390d2d78ff4bf9e0.
Unfortunately, this breaks the build on systems where linux/in6.h and
netinet/in.h can't both be included, such as Ubuntu 14.04 and Debian
Jessie.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sockunion.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/sockunion.c b/lib/sockunion.c index 8f3540d3..c7315f28 100644 --- a/lib/sockunion.c +++ b/lib/sockunion.c @@ -29,10 +29,6 @@ #include "log.h" #include "jhash.h" -#if defined(HAVE_LINUX_IN6_H) -#include <linux/in6.h> -#endif - #ifndef HAVE_INET_ATON int inet_aton (const char *cp, struct in_addr *inaddr) @@ -510,13 +506,13 @@ sockopt_minttl (int family, int sock, int minttl) return ret; } #endif /* IP_MINTTL */ -#ifdef IPV6_MINHOPCOUNT +#ifdef IPV6_MINHOPCNT if (family == AF_INET6) { - int ret = setsockopt (sock, IPPROTO_IPV6, IPV6_MINHOPCOUNT, &minttl, sizeof(minttl)); + int ret = setsockopt (sock, IPPROTO_IPV6, IPV6_MINHOPCNT, &minttl, sizeof(minttl)); if (ret < 0) zlog (NULL, LOG_WARNING, - "can't set sockopt IPV6_MINHOPCOUNT to %d on socket %d: %s", + "can't set sockopt IPV6_MINHOPCNT to %d on socket %d: %s", minttl, sock, safe_strerror (errno)); return ret; } |