Merge branch 'master' into breakloop_poll

diff --cc CMakeLists.txt
Simple merge

diff --cc cmakeconfig.h.in
Simple merge

diff --cc pcap-int.h
Simple merge

diff --cc pcap-linux.c
index a00cb871d14c0359be31357014d1622a07fc591b,dd21e5c32c28db0d369f3327ec58841a88102810..f37d74e15273d43c108d71b311fb069f6cd0f14f
--- 1/pcap-linux.c
--- 2/pcap-linux.c
+++ b/pcap-linux.c
@@@ -137,6 -137,6 +137,9 @@@
  #include <net/if_arp.h>
  #include <poll.h>
  #include <dirent.h>
++#ifdef HAVE_SYS_EVENTFD_H
++#include <sys/eventfd.h>
++#endif
  
  #include "pcap-int.h"
  #include "pcap/sll.h"

diff --cc pcap.c
Simple merge