From b70b117e9cbd5913c573167380ed605181cd6b45 Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Fri, 20 Apr 2018 19:56:05 +0200
Subject: [PATCH] Rename some symbols to please an older version of bison.
MacOS provides an older version of bison which results in
macro redifinitions for CMSG_LEN and CMSG_DATA. Renaming
them resolves this.
---
gtests/net/packetdrill/lexer.l | 4 ++--
gtests/net/packetdrill/parser.y | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/gtests/net/packetdrill/lexer.l b/gtests/net/packetdrill/lexer.l
index cdb1cffd..a91ab140 100644
--- a/gtests/net/packetdrill/lexer.l
+++ b/gtests/net/packetdrill/lexer.l
@@ -289,10 +289,10 @@ msg_name return MSG_NAME;
msg_iov return MSG_IOV;
msg_control return MSG_CONTROL;
msg_flags return MSG_FLAGS;
-cmsg_len return CMSG_LEN;
+cmsg_len return _CMSG_LEN_;
cmsg_level return CMSG_LEVEL;
cmsg_type return CMSG_TYPE;
-cmsg_data return CMSG_DATA;
+cmsg_data return _CMSG_DATA_;
fd return FD;
events return EVENTS;
revents return REVENTS;
diff --git a/gtests/net/packetdrill/parser.y b/gtests/net/packetdrill/parser.y
index db2b43f4..9d00c784 100644
--- a/gtests/net/packetdrill/parser.y
+++ b/gtests/net/packetdrill/parser.y
@@ -559,7 +559,7 @@ static struct tcp_option *new_tcp_exp_fast_open_option(const char *cookie_string
*/
%token ELLIPSIS
%token <reserved> SA_FAMILY SIN_PORT SIN_ADDR _HTONS_ _HTONL_ INET_ADDR
-%token <reserved> MSG_NAME MSG_IOV MSG_FLAGS MSG_CONTROL CMSG_LEN CMSG_LEVEL CMSG_TYPE CMSG_DATA
+%token <reserved> MSG_NAME MSG_IOV MSG_FLAGS MSG_CONTROL _CMSG_LEN_ CMSG_LEVEL CMSG_TYPE _CMSG_DATA_
%token <reserved> SF_HDTR_HEADERS SF_HDTR_TRAILERS
%token <reserved> FD EVENTS REVENTS ONOFF LINGER
%token <reserved> ACK ECR EOL MSS NOP SACK NR_SACK SACKOK TIMESTAMP VAL WIN WSCALE PRO
@@ -3188,19 +3188,19 @@ cmsg_type
;
cmsg_data
-: CMSG_DATA '=' sctp_initmsg { $$ = $3; }
-| CMSG_DATA '=' sctp_sndrcvinfo { $$ = $3; }
-| CMSG_DATA '=' sctp_extrcvinfo { $$ = $3; }
-| CMSG_DATA '=' sctp_sndinfo { $$ = $3; }
-| CMSG_DATA '=' sctp_rcvinfo { $$ = $3; }
-| CMSG_DATA '=' sctp_nxtinfo { $$ = $3; }
-| CMSG_DATA '=' sctp_prinfo { $$ = $3; }
-| CMSG_DATA '=' sctp_authinfo { $$ = $3; }
-| CMSG_DATA '=' sockaddr { $$ = $3; }
+: _CMSG_DATA_ '=' sctp_initmsg { $$ = $3; }
+| _CMSG_DATA_ '=' sctp_sndrcvinfo { $$ = $3; }
+| _CMSG_DATA_ '=' sctp_extrcvinfo { $$ = $3; }
+| _CMSG_DATA_ '=' sctp_sndinfo { $$ = $3; }
+| _CMSG_DATA_ '=' sctp_rcvinfo { $$ = $3; }
+| _CMSG_DATA_ '=' sctp_nxtinfo { $$ = $3; }
+| _CMSG_DATA_ '=' sctp_prinfo { $$ = $3; }
+| _CMSG_DATA_ '=' sctp_authinfo { $$ = $3; }
+| _CMSG_DATA_ '=' sockaddr { $$ = $3; }
;
cmsghdr
-: '{' CMSG_LEN '=' INTEGER ',' cmsg_level ',' cmsg_type ',' cmsg_data '}' {
+: '{' _CMSG_LEN_ '=' INTEGER ',' cmsg_level ',' cmsg_type ',' cmsg_data '}' {
$$ = new_expression(EXPR_CMSGHDR);
$$->value.cmsghdr = calloc(1, sizeof(struct cmsghdr_expr));
if (!is_valid_s32($4)) {
--
GitLab