Merge branch 'vendor/LIBPCAP'
authorAntonio Huete Jimenez <tuxillo@quantumachine.net>
Sat, 17 Mar 2018 15:44:00 +0000 (08:44 -0700)
committerAntonio Huete Jimenez <tuxillo@quantumachine.net>
Sat, 17 Mar 2018 15:44:00 +0000 (08:44 -0700)
Conflicts:
contrib/libpcap/scanner.l

1  2 
contrib/libpcap/gencode.c
contrib/libpcap/grammar.y
contrib/libpcap/scanner.l

  #ifdef HAVE_NET_PFVAR_H
  #include <sys/socket.h>
  #include <net/if.h>
 -#include <net/pfvar.h>
 -#include <net/if_pflog.h>
 +#include <net/pf/pfvar.h>
 +#include <net/pf/if_pflog.h>
  #endif
  #ifndef offsetof
  #define offsetof(s, e) ((size_t)&((s *)0)->e)
  #endif
@@@ -53,11 -74,15 +74,15 @@@ struct rtentry
  #include "pcap-int.h"
  
  #include "gencode.h"
+ #include "grammar.h"
+ #include "scanner.h"
  #ifdef HAVE_NET_PFVAR_H
  #include <net/if.h>
 -#include <net/pfvar.h>
 -#include <net/if_pflog.h>
 +#include <net/pf/pfvar.h>
 +#include <net/pf/if_pflog.h>
  #endif
+ #include "llc.h"
  #include "ieee80211.h"
  #include <pcap/namedb.h>
  
Simple merge