DPDK patches and discussions
 help / color / mirror / Atom feed
From: Fady Bader <fady@mellanox.com>
To: dev@dpdk.org
Cc: fady@mellanox.com, thomasm@mellanox.com, 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 1/3] net: fix s_addr redefinition in Windows
Date: Wed, 10 Jun 2020 14:23:24 +0300	[thread overview]
Message-ID: <20200610112326.18576-2-fady@mellanox.com> (raw)
In-Reply-To: <20200610112326.18576-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
+ */
+#undef s_addr
 #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. */

  reply	other threads:[~2020-06-10 11:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-10 11:23 [dpdk-dev] [PATCH 0/3] compile librte_net for windows Fady Bader
2020-06-10 11:23 ` Fady Bader [this message]
2020-06-10 11:23 ` [dpdk-dev] [PATCH 2/3] net: add htons to minGW for Windows Fady Bader
2020-06-10 11:23 ` [dpdk-dev] [PATCH 3/3] eal/windows: librte_net build on Windows Fady Bader

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200610112326.18576-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=thomasm@mellanox.com \
    --cc=yohadt@mellanox.com \


* 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).