[dpdk-dev] [PATCH v2 5/7] fix the Marco conflict

[Jingjing Wu]

fix the Marco conflict between rte_ip.h and netinet/in.h
 
Signed-off-by: jingjing.wu <jingjing.wu at intel.com>
Reviewed-by: Helin Zhang <helin.zhang at intel.com>
Reviewed-by: Jing Chen <jing.d.chen at intel.com>
Reviewed-by: Jijiang Liu <jijiang.liu at intel.com>
 
---
 lib/librte_net/rte_ip.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index e3f65c1..67b6c2d 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -116,6 +116,8 @@ struct ipv4_hdr {
 
 #define	IPV4_HDR_OFFSET_UNITS	8
 
+#ifndef _NETINET_IN_H
+#ifndef _NETINET_IN_H_
 /* IPv4 protocols */
 #define IPPROTO_IP         0  /**< dummy for IP */
 #define IPPROTO_HOPOPTS    0  /**< IP6 hop-by-hop options */
@@ -226,7 +228,8 @@ struct ipv4_hdr {
 #define IPPROTO_DIVERT   254  /**< divert pseudo-protocol */
 #define IPPROTO_RAW      255  /**< raw IP packet */
 #define IPPROTO_MAX      256  /**< maximum protocol number */
-
+#endif /* _NETINET_IN_H_ */
+#endif /* _NETINET_IN_H */
 /*
  * IPv4 address types
  */
-- 
1.8.1.4