diff options
| author | guy <guy> | 2003-12-16 05:19:56 +0000 |
|---|---|---|
| committer | guy <guy> | 2003-12-16 05:19:56 +0000 |
| commit | 9aa42d6e5c0513dff6d4bcf97abcfe8d4bc6cf4e (patch) | |
| tree | aa6d3047943e4e7ba2aa6f5d8562e607b98acc1f /grammar.y | |
| parent | 6d807409341364acd586c4b5d2ea084abadf0950 (diff) | |
| download | libpcap-9aa42d6e5c0513dff6d4bcf97abcfe8d4bc6cf4e.tar.gz | |
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".
Diffstat (limited to 'grammar.y')
| -rw-r--r-- | grammar.y | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -22,7 +22,7 @@ */ #ifndef lint 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 #ifdef HAVE_CONFIG_H @@ -115,7 +115,7 @@ pcap_parse() %type <blk> atmfieldvalue atmvalue atmlistvalue %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 ATALK AARP DECNET LAT SCA MOPRC MOPDL %token TK_BROADCAST TK_MULTICAST @@ -177,7 +177,7 @@ id: nid nid: ID { $$.b = gen_scode($1, $$.q = $<blk>0.q); } | HID '/' NUM { $$.b = gen_mcode($1, NULL, $3, $$.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); } | HID { /* Decide how to parse HID based on proto */ |