Skip to content

Commit

Permalink
Remove the workaround for LynxOS. [skip appveyor]
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
infrastation committed Aug 19, 2024
1 parent 269f610 commit 747fcb1
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions fad-getad.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,22 +58,16 @@
* we end up including both the OS's <net/bpf.h> and our <pcap/bpf.h>,
* 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 <netpacket/packet.h>
# else /* HAVE_NETPACKET_PACKET_H */
/* LynxOS, Linux distributions with older glibc */
# ifdef __Lynx__
/* LynxOS */
# include <netpacket/if_packet.h>
# else /* __Lynx__ */
/* Linux */
/* Linux distributions with older glibc */
# include <linux/types.h>
# include <linux/if_packet.h>
# endif /* __Lynx__ */
# endif /* HAVE_NETPACKET_PACKET_H */
#endif /* (defined(__linux__) || defined(__Lynx__)) && defined(AF_PACKET) */
#endif /* defined(__linux__) && defined(AF_PACKET) */

/*
* This is fun.
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 747fcb1

Please sign in to comment.