diff options
| author | delphij <delphij@FreeBSD.org> | 2012-05-14 05:12:56 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2012-05-14 05:12:56 +0000 |
| commit | a3451bb93bbf335a8f6b5feb9b80b256b0e304fe (patch) | |
| tree | 158e6045ed438c41ac8de6cb27ac3c73cdc6643a /contrib/libpcap/scanner.l | |
| parent | a17ebbd192e814c313397aefc289ab32a0ece772 (diff) | |
| parent | e11c3f548e0bd184480800016b8567824dc35516 (diff) | |
| download | FreeBSD-src-a3451bb93bbf335a8f6b5feb9b80b256b0e304fe.zip FreeBSD-src-a3451bb93bbf335a8f6b5feb9b80b256b0e304fe.tar.gz | |
Merge from vendor branch: update libpcap to 1.2.1.
MFC after: 2 weeks
Diffstat (limited to 'contrib/libpcap/scanner.l')
| -rw-r--r-- | contrib/libpcap/scanner.l | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/libpcap/scanner.l b/contrib/libpcap/scanner.l index 9d981d7..88c0028 100644 --- a/contrib/libpcap/scanner.l +++ b/contrib/libpcap/scanner.l @@ -56,7 +56,7 @@ static const char rcsid[] _U_ = #include <pcap-stdinc.h> #ifdef __MINGW32__ -#include "IP6_misc.h" +#include "ip6_misc.h" #endif #else /* WIN32 */ #include <sys/socket.h> /* for "struct sockaddr" in "struct addrinfo" */ @@ -79,6 +79,7 @@ static int stoi(char *); static inline int xdtoi(int); #ifdef FLEX_SCANNER +#define YY_NO_INPUT #define YY_NO_UNPUT static YY_BUFFER_STATE in_buffer; #else @@ -203,6 +204,7 @@ igmp return IGMP; igrp return IGRP; pim return PIM; vrrp return VRRP; +carp return CARP; radio return RADIO; ip6 { @@ -274,6 +276,8 @@ address1|addr1 return ADDR1; address2|addr2 return ADDR2; address3|addr3 return ADDR3; address4|addr4 return ADDR4; +ra return RA; +ta return TA; less return LESS; greater return GREATER; |
