X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3824a6c0417a551961d1a1bf4f94f10eff736afc..c0de704a5331dd3b9bd060dd0969163025186c0e:/print-ripng.c diff --git a/print-ripng.c b/print-ripng.c index 5f231d0f..cef39daf 100644 --- a/print-ripng.c +++ b/print-ripng.c @@ -19,6 +19,10 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#ifndef lint +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.18 2005-01-04 00:15:54 guy Exp $"; +#endif #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,22 +31,6 @@ #ifdef INET6 #include - -#ifdef WIN32 -const struct in6_addr in6addr_any; /* :: */ -#endif /* WIN32 */ - -#ifdef __MINGW32__ -int -IN6_ADDR_EQUAL(const struct in6_addr *a, const struct in6_addr *b) -{ - return (memcmp(a, b, sizeof(struct in6_addr)) == 0); -} - -#define IN6_IS_ADDR_UNSPECIFIED(a) IN6_ADDR_EQUAL((a), &in6addr_any) - -#endif /* __MINGW32__ */ - #include #include "route6d.h" @@ -50,10 +38,14 @@ IN6_ADDR_EQUAL(const struct in6_addr *a, const struct in6_addr *b) #include "addrtoname.h" #include "extract.h" -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ripng.c,v 1.16 2003-11-15 00:39:37 guy Exp $"; +#if !defined(IN6_IS_ADDR_UNSPECIFIED) && !defined(_MSC_VER) /* MSVC inline */ +static int IN6_IS_ADDR_UNSPECIFIED(const struct in6_addr *addr) +{ + static const struct in6_addr in6addr_any; /* :: */ + return (memcmp(addr, &in6addr_any, sizeof(*addr)) == 0); +} #endif + static int rip6_entry_print(register const struct netinfo6 *ni, int metric) {