mirror of
https://github.com/zeek/zeek.git
synced 2025-10-16 13:38:19 +00:00
Fix preprocessor logic for ethernet header choice.
Checking for netinet/if_ether.h and netinet/ip6.h depended on including other headers first; observed when trying to build on FreeBSD. ARP.h was changed to conform to CMake style config.h generation. Definitions are not set to 1 like with autotools, so we have to check for definition, not just that the value is true.
This commit is contained in:
parent
43cbe2a9fc
commit
bea41f5c73
2 changed files with 7 additions and 5 deletions
|
@ -13,9 +13,9 @@
|
|||
#include <net/if_arp.h>
|
||||
#ifdef HAVE_NET_ETHERNET_H
|
||||
#include <net/ethernet.h>
|
||||
#elif HAVE_SYS_ETHERNET_H
|
||||
#elif defined(HAVE_SYS_ETHERNET_H)
|
||||
#include <sys/ethernet.h>
|
||||
#elif HAVE_NETINET_IF_ETHER_H
|
||||
#elif defined(HAVE_NETINET_IF_ETHER_H)
|
||||
#include <netinet/if_ether.h>
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue