diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-08-07 15:56:11 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-08-07 15:56:11 -0700 |
| commit | 4a3412c9ee9589b66e19c3cff5e034b3df9d29a3 (patch) | |
| tree | 83278ba38396ced64d5850017bbec799bc418920 /nametoaddr.c | |
| parent | 93548574db5f433d74dfdb29ec037a6e9e355783 (diff) | |
Cope with the NetBSD issue in a different way.
Define DLT_USB the way we used to, and undefine DLT_MATCHING_MAX before
defining it. (We arguably never should have exported it, as the only
code that should be using it is the LINKTYPE_ <-> DLT_ converting code,
but....)
Diffstat (limited to 'nametoaddr.c')
| -rw-r--r-- | nametoaddr.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/nametoaddr.c b/nametoaddr.c index 8fc2e8d9..71280b31 100644 --- a/nametoaddr.c +++ b/nametoaddr.c @@ -81,20 +81,6 @@ struct mbuf; /* Squelch compiler warnings on some platforms for */ struct rtentry; /* declarations in <net/if.h> */ #include <net/if.h> /* for "struct ifnet" in "struct arpcom" on Solaris */ #include <netinet/if_ether.h> - -/* - * NetBSD insists on having <net/if.h> pull in <net/dlt.h>, so that - * including <net/if.h> defines a bunch of stuff we later define in our - * pcap/dlt.h; those definitions will be different, if they haven't - * picked up all of our changes yet. - * - * Undefine some of the offending items. - */ -#ifdef __NetBSD__ -#undef DLT_USB /* we now define it as DLT_FREEBSD_USB */ -#undef DLT_MATCHING_MAX /* we may define more DLT_ values than they do */ -#endif - #endif /* HAVE_NETINET_IF_ETHER_H */ #ifdef NETINET_ETHER_H_DECLARES_ETHER_HOSTTON #include <netinet/ether.h> |