From: Fady Bader <fady@mellanox.com>
To: talshn@mellanox.com
Cc: fady@mellanox.com, stable@dpdk.org
Subject: [dpdk-stable] [PATCH 1/2] net: fix s_addr definition problem
Date: Mon, 27 Apr 2020 18:35:26 +0300 [thread overview]
Message-ID: <20200427153527.24324-2-fady@mellanox.com> (raw)
In-Reply-To: <20200427153527.24324-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
Fixes: 6d13ea8e8e49ab9 ("net: add rte prefix to ether structures")
Cc: stable@dpdk.org
Signed-off-by: Fady Bader <fady@mellanox.com>
---
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 <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
parent reply other threads:[~2020-04-27 15:35 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20200427153527.24324-1-fady@mellanox.com>]
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=20200427153527.24324-2-fady@mellanox.com \
--to=fady@mellanox.com \
--cc=stable@dpdk.org \
--cc=talshn@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).