From 747fcb137111db97d79616d17b07c58cc0b2b44b Mon Sep 17 00:00:00 2001 From: Denis Ovsienko Date: Mon, 19 Aug 2024 22:18:12 +0100 Subject: [PATCH] Remove the workaround for LynxOS. [skip appveyor] LynxOS still exists, but there are no easy means to confirm that libpcap still compiles and works on it and whether it still requires the workaround from 2011, so let's get rid of it to simplify the matter for the better supported OSes. --- fad-getad.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/fad-getad.c b/fad-getad.c index b065b09cba..f769d7e755 100644 --- a/fad-getad.c +++ b/fad-getad.c @@ -58,22 +58,16 @@ * we end up including both the OS's and our , * and their definitions of some data structures collide. */ -#if (defined(__linux__) || defined(__Lynx__)) && defined(AF_PACKET) +#if defined(__linux__) && defined(AF_PACKET) # ifdef HAVE_NETPACKET_PACKET_H /* Linux distributions with newer glibc */ # include # else /* HAVE_NETPACKET_PACKET_H */ -/* LynxOS, Linux distributions with older glibc */ -# ifdef __Lynx__ -/* LynxOS */ -# include -# else /* __Lynx__ */ -/* Linux */ +/* Linux distributions with older glibc */ # include # include -# endif /* __Lynx__ */ # endif /* HAVE_NETPACKET_PACKET_H */ -#endif /* (defined(__linux__) || defined(__Lynx__)) && defined(AF_PACKET) */ +#endif /* defined(__linux__) && defined(AF_PACKET) */ /* * This is fun. @@ -128,7 +122,7 @@ get_sa_len(struct sockaddr *addr) return (sizeof (struct sockaddr_in6)); #endif -#if (defined(__linux__) || defined(__Lynx__)) && defined(AF_PACKET) +#if defined(__linux__) && defined(AF_PACKET) case AF_PACKET: return (sizeof (struct sockaddr_ll)); #endif