[dpdk-stable] [PATCH 1/2] net: fix s_addr definition problem

[Fady Bader <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