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 668B1A051B; Wed, 10 Jun 2020 14:01:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DEAAC1BEDD; Wed, 10 Jun 2020 14:01:21 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 7EBF71BED1 for ; Wed, 10 Jun 2020 14:01:20 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from fady@mellanox.com) with SMTP; 10 Jun 2020 15:00:46 +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 05AC0iZD006240; Wed, 10 Jun 2020 15:00:45 +0300 From: Fady Bader To: dev@dpdk.org Cc: fady@mellanox.com, thomas@monjalon.net, tbashar@mellanox.com, talshn@mellanox.com, yohadt@mellanox.com, dmitry.kozliuk@gmail.com, harini.ramakrishnan@microsoft.com, ocardona@microsoft.com, anand.rawat@intel.com, ranjit.menon@intel.com, olivier.matz@6wind.com Date: Wed, 10 Jun 2020 15:00:38 +0300 Message-Id: <20200610120040.17968-2-fady@mellanox.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20200610120040.17968-1-fady@mellanox.com> References: <'20200610112326.18576-1-fady@mellanox.com'> <20200610120040.17968-1-fady@mellanox.com> Subject: [dpdk-dev] [PATCH v2 1/3] net: fix s_addr redefinition in Windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" s_addr in Windows is defined in windows.h so its undefined in order to be defined as part of rte_ether_hdr. Signed-off-by: Fady Bader --- lib/librte_net/rte_ether.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index 0ae4e75b6..f6e37d9e5 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -23,6 +23,15 @@ 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