From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 8767CA00BE;
Wed, 8 Jul 2020 10:25:44 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 81B7C1DC34;
Wed, 8 Jul 2020 10:25:43 +0200 (CEST)
Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])
by dpdk.org (Postfix) with ESMTP id E0A471DC30
for <dev@dpdk.org>; Wed, 8 Jul 2020 10:25:41 +0200 (CEST)
Received: from Internal Mail-Server by MTLPINE1 (envelope-from
fady@mellanox.com) with SMTP; 8 Jul 2020 11:25:36 +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 0688PamI026821;
Wed, 8 Jul 2020 11:25:36 +0300
From: Fady Bader <fady@mellanox.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, tbashar@mellanox.com, talshn@mellanox.com,
yohadt@mellanox.com, dmitry.kozliuk@gmail.com,
harini.ramakrishnan@microsoft.com, ocardona@microsoft.com,
pallavi.kadam@intel.com, ranjit.menon@intel.com, olivier.matz@6wind.com
Date: Wed, 8 Jul 2020 11:25:23 +0300
Message-Id: <20200708082525.28504-2-fady@mellanox.com>
X-Mailer: git-send-email 2.16.1.windows.4
In-Reply-To: <20200708082525.28504-1-fady@mellanox.com>
References: <20200610120040.17968-1-fady@mellanox.com>
<20200708082525.28504-1-fady@mellanox.com>
Subject: [dpdk-dev] [PATCH v3 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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
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 <fady@mellanox.com>
---
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 0ae4e75b6c..f6e37d9e5e 100644
--- a/lib/librte_net/rte_ether.h
+++ b/lib/librte_net/rte_ether.h
@@ -23,6 +23,15 @@ extern "C" {
#include <rte_mbuf.h>
#include <rte_byteorder.h>
+/*
+ * 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