On Mac OS X 10.3, including <sys/socket.h> eventually drags in a header
file that defines MASK, so when compiling the lexical analyzer, if INET6 is defined you get a redefinition warning. Use NETMASK rather than MASK for the token "mask".
This commit is contained in:
parent
6d80740934
commit
9aa42d6e5c
|
@ -22,7 +22,7 @@
|
||||||
*/
|
*/
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char rcsid[] _U_ =
|
static const char rcsid[] _U_ =
|
||||||
"@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.80 2003-11-15 23:24:00 guy Exp $ (LBL)";
|
"@(#) $Header: /tcpdump/master/libpcap/grammar.y,v 1.81 2003-12-16 05:19:56 guy Exp $ (LBL)";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -115,7 +115,7 @@ pcap_parse()
|
||||||
%type <blk> atmfieldvalue atmvalue atmlistvalue
|
%type <blk> atmfieldvalue atmvalue atmlistvalue
|
||||||
|
|
||||||
%token DST SRC HOST GATEWAY
|
%token DST SRC HOST GATEWAY
|
||||||
%token NET MASK PORT LESS GREATER PROTO PROTOCHAIN CBYTE
|
%token NET NETMASK PORT LESS GREATER PROTO PROTOCHAIN CBYTE
|
||||||
%token ARP RARP IP SCTP TCP UDP ICMP IGMP IGRP PIM VRRP
|
%token ARP RARP IP SCTP TCP UDP ICMP IGMP IGRP PIM VRRP
|
||||||
%token ATALK AARP DECNET LAT SCA MOPRC MOPDL
|
%token ATALK AARP DECNET LAT SCA MOPRC MOPDL
|
||||||
%token TK_BROADCAST TK_MULTICAST
|
%token TK_BROADCAST TK_MULTICAST
|
||||||
|
@ -177,7 +177,7 @@ id: nid
|
||||||
nid: ID { $$.b = gen_scode($1, $$.q = $<blk>0.q); }
|
nid: ID { $$.b = gen_scode($1, $$.q = $<blk>0.q); }
|
||||||
| HID '/' NUM { $$.b = gen_mcode($1, NULL, $3,
|
| HID '/' NUM { $$.b = gen_mcode($1, NULL, $3,
|
||||||
$$.q = $<blk>0.q); }
|
$$.q = $<blk>0.q); }
|
||||||
| HID MASK HID { $$.b = gen_mcode($1, $3, 0,
|
| HID NETMASK HID { $$.b = gen_mcode($1, $3, 0,
|
||||||
$$.q = $<blk>0.q); }
|
$$.q = $<blk>0.q); }
|
||||||
| HID {
|
| HID {
|
||||||
/* Decide how to parse HID based on proto */
|
/* Decide how to parse HID based on proto */
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char rcsid[] _U_ =
|
static const char rcsid[] _U_ =
|
||||||
"@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.96 2003-11-15 23:24:05 guy Exp $ (LBL)";
|
"@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.97 2003-12-16 05:19:56 guy Exp $ (LBL)";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -232,7 +232,7 @@ netbeui return NETBEUI;
|
||||||
|
|
||||||
host return HOST;
|
host return HOST;
|
||||||
net return NET;
|
net return NET;
|
||||||
mask return MASK;
|
mask return NETMASK;
|
||||||
port return PORT;
|
port return PORT;
|
||||||
proto return PROTO;
|
proto return PROTO;
|
||||||
protochain {
|
protochain {
|
||||||
|
|
Reference in New Issue