From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Mon, 23 Jan 2012 00:08:22 +0000 (-0800)
Subject: Merge branch 'vendor/LIBPCAP'
X-Git-Tag: v3.4.0rc~1365
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/3566868596fe1d31a2228881c385d96a0bedb74d

Merge branch 'vendor/LIBPCAP'
---

3566868596fe1d31a2228881c385d96a0bedb74d
diff --cc contrib/libpcap/scanner.l
index f2d0d80c12,064e9c885f..2676710ee2
--- a/contrib/libpcap/scanner.l
+++ b/contrib/libpcap/scanner.l
@@@ -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++)