From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 87550A00BE for ; Mon, 27 Apr 2020 17:35:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7E3A21D411; Mon, 27 Apr 2020 17:35:34 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id C75B31D411 for ; Mon, 27 Apr 2020 17:35:32 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from fady@mellanox.com) with ESMTPS (AES256-SHA encrypted); 27 Apr 2020 18:35:28 +0300 Received: from l-wincomp04-vm.labs.mlnx (l-wincomp04-vm.mtl.labs.mlnx [10.237.1.5]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 03RFZSXA011456; Mon, 27 Apr 2020 18:35:28 +0300 From: Fady Bader To: talshn@mellanox.com Cc: fady@mellanox.com, stable@dpdk.org Date: Mon, 27 Apr 2020 18:35:26 +0300 Message-Id: <20200427153527.24324-2-fady@mellanox.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20200427153527.24324-1-fady@mellanox.com> References: <20200427153527.24324-1-fady@mellanox.com> Subject: [dpdk-stable] [PATCH 1/2] net: fix s_addr definition problem X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" s_addr in Windows is defined in windows.h so its undefined in order to be defined as part of rte_ether_hdr Fixes: 6d13ea8e8e49ab9 ("net: add rte prefix to ether structures") Cc: stable@dpdk.org Signed-off-by: Fady Bader --- lib/librte_net/rte_ether.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index e069dc7fe..edf9861dc 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -23,6 +23,14 @@ extern "C" { #include #include +/* + * s_addr in windows is defined in windows.h + * it is undefined here to be defined as part of rte_ether_hdr + */ +#ifdef RTE_EXEC_ENV_WINDOWS +#undef s_addr +#endif + #define RTE_ETHER_ADDR_LEN 6 /**< Length of Ethernet address. */ #define RTE_ETHER_TYPE_LEN 2 /**< Length of Ethernet type field. */ #define RTE_ETHER_CRC_LEN 4 /**< Length of Ethernet CRC. */ -- 2.16.1.windows.4