Merge branch 'vendor/LIBPCAP'
authorPeter Avalos <pavalos@dragonflybsd.org>
Mon, 23 Jan 2012 00:08:22 +0000 (16:08 -0800)
committerPeter Avalos <pavalos@dragonflybsd.org>
Mon, 23 Jan 2012 00:08:22 +0000 (16:08 -0800)
1  2 
contrib/libpcap/bpf/net/bpf_filter.c
contrib/libpcap/gencode.c
contrib/libpcap/grammar.y
contrib/libpcap/pcap/pcap.h
contrib/libpcap/scanner.l

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -63,11 -77,11 +77,12 @@@ static int stoi(char *)
  static inline int xdtoi(int);
  
  #ifdef FLEX_SCANNER
+ #define YY_NO_INPUT
  #define YY_NO_UNPUT
 +#define YY_NO_INPUT
  static YY_BUFFER_STATE in_buffer;
  #else
- static char *in_buffer;
+ static const char *in_buffer;
  
  #undef getc
  #define getc(fp)  (*in_buffer == 0 ? EOF : *in_buffer++)