From: Fady Bader <fady@mellanox.com>
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
Subject: [dpdk-dev] [PATCH v2 1/3] net: fix s_addr redefinition in Windows
Date: Wed, 10 Jun 2020 15:00:38 +0300 [thread overview]
Message-ID: <20200610120040.17968-2-fady@mellanox.com> (raw)
In-Reply-To: <20200610120040.17968-1-fady@mellanox.com>
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 0ae4e75b6..f6e37d9e5 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
next prev parent reply other threads:[~2020-06-10 12:01 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <'20200610112326.18576-1-fady@mellanox.com'>
2020-06-10 12:00 ` [dpdk-dev] [PATCH v2 0/3] compile librte_net for windows Fady Bader
2020-06-10 12:00 ` Fady Bader [this message]
2020-06-10 12:00 ` [dpdk-dev] [PATCH v2 2/3] net: add htons to minGW for Windows Fady Bader
2020-06-10 12:33 ` Jerin Jacob
2020-06-10 12:00 ` [dpdk-dev] [PATCH v2 3/3] eal/windows: librte_net build on Windows Fady Bader
2020-06-16 9:04 ` Thomas Monjalon
2020-07-06 8:44 ` Fady Bader
2020-06-20 19:22 ` Dmitry Kozlyuk
2020-06-28 9:48 ` Fady Bader
2020-07-17 22:22 ` Narcisa Ana Maria Vasile
2020-07-20 12:54 ` Fady Bader
2020-07-20 16:26 ` Dmitry Kozlyuk
2020-07-22 10:20 ` Fady Bader
2020-07-22 10:30 ` Bruce Richardson
2020-07-27 8:54 ` Fady Bader
2020-07-27 8:53 ` Fady Bader
2020-07-08 8:25 ` [dpdk-dev] [PATCH v3 0/3] compile librte_net for windows Fady Bader
2020-07-08 8:25 ` [dpdk-dev] [PATCH v3 1/3] net: fix s_addr redefinition in Windows Fady Bader
2020-07-13 14:38 ` Olivier Matz
2020-07-15 6:26 ` Fady Bader
2020-07-08 8:25 ` [dpdk-dev] [PATCH v3 2/3] net: replace htons with rte_cpu_to_be_16 Fady Bader
2020-07-09 13:39 ` Morten Brørup
2020-07-13 14:38 ` Olivier Matz
2020-07-15 6:04 ` Fady Bader
2020-07-08 8:25 ` [dpdk-dev] [PATCH v3 3/3] eal/windows: librte_net build on Windows Fady Bader
2020-07-08 9:10 ` Thomas Monjalon
2020-07-08 10:19 ` Fady Bader
2020-07-23 7:08 ` [dpdk-dev] [PATCH v4 0/3] compile librte_net for windows Fady Bader
2020-07-23 7:08 ` [dpdk-dev] [PATCH v4 1/3] net: fix s_addr redefinition in Windows Fady Bader
2020-07-23 7:08 ` [dpdk-dev] [PATCH v4 2/3] net: replace htons with RTE_BE16 Fady Bader
2020-07-23 7:08 ` [dpdk-dev] [PATCH v4 3/3] eal/windows: librte_net build on Windows Fady Bader
2020-09-08 8:14 ` Ophir Munk
2020-07-24 1:11 ` [dpdk-dev] [PATCH v4 0/3] compile librte_net for windows Ranjit Menon
2020-09-10 19:55 ` Thomas Monjalon
2020-07-24 15:52 ` Kadam, Pallavi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200610120040.17968-2-fady@mellanox.com \
--to=fady@mellanox.com \
--cc=anand.rawat@intel.com \
--cc=dev@dpdk.org \
--cc=dmitry.kozliuk@gmail.com \
--cc=harini.ramakrishnan@microsoft.com \
--cc=ocardona@microsoft.com \
--cc=olivier.matz@6wind.com \
--cc=ranjit.menon@intel.com \
--cc=talshn@mellanox.com \
--cc=tbashar@mellanox.com \
--cc=thomas@monjalon.net \
--cc=yohadt@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).