From: Jingjing Wu <jingjing.wu@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 5/7] fix the Marco conflict
Date: Wed, 27 Aug 2014 10:13:52 +0800 [thread overview]
Message-ID: <1409105634-29980-6-git-send-email-jingjing.wu@intel.com> (raw)
In-Reply-To: <1409105634-29980-1-git-send-email-jingjing.wu@intel.com>
fix the Marco conflict between rte_ip.h and netinet/in.h
Signed-off-by: jingjing.wu <jingjing.wu@intel.com>
Reviewed-by: Helin Zhang <helin.zhang@intel.com>
Reviewed-by: Jing Chen <jing.d.chen@intel.com>
Reviewed-by: Jijiang Liu <jijiang.liu@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
next prev parent reply other threads:[~2014-08-27 2:10 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-27 2:13 [dpdk-dev] [PATCH v2 0/7] Support flow director programming on fortville Jingjing Wu
2014-08-27 2:13 ` [dpdk-dev] [PATCH v2 1/7] i40e: flow director resource reserve and initialize on i40e Jingjing Wu
2014-08-27 14:17 ` Thomas Monjalon
2014-08-28 2:56 ` Wu, Jingjing
2014-08-27 2:13 ` [dpdk-dev] [PATCH v2 2/7] ethdev: define new ethdev API rx_classification_filter_ctl Jingjing Wu
2014-08-27 14:22 ` Thomas Monjalon
2014-08-28 3:30 ` Wu, Jingjing
2014-08-28 10:55 ` Thomas Monjalon
2014-08-28 11:48 ` Ananyev, Konstantin
2014-08-28 14:07 ` Wu, Jingjing
2014-08-28 13:39 ` Wu, Jingjing
2014-08-28 14:20 ` Thomas Monjalon
2014-08-28 14:31 ` Wu, Jingjing
2014-08-27 2:13 ` [dpdk-dev] [PATCH v2 3/7] i40e: function implement in i40e for flow director filter programming Jingjing Wu
2014-08-27 14:24 ` Thomas Monjalon
2014-08-28 2:57 ` Wu, Jingjing
2014-08-27 2:13 ` [dpdk-dev] [PATCH v2 4/7] i40e: function implement in i40e for flow director flush and info get Jingjing Wu
2014-08-27 2:13 ` Jingjing Wu [this message]
2014-08-27 14:27 ` [dpdk-dev] [PATCH v2 5/7] fix the Marco conflict Thomas Monjalon
2014-08-28 3:39 ` Wu, Jingjing
2014-08-28 8:55 ` Thomas Monjalon
2014-08-28 14:37 ` Wu, Jingjing
2014-08-28 14:46 ` Thomas Monjalon
2014-08-27 2:13 ` [dpdk-dev] [PATCH v2 6/7] i40e: support FD ID report and match counter for i40e flow director Jingjing Wu
2014-08-27 2:13 ` [dpdk-dev] [PATCH v2 7/7]app/testpmd: add commands and config functions for i40e flow director support Jingjing Wu
2014-08-27 14:35 ` Thomas Monjalon
2014-08-27 16:54 ` Venkatesan, Venky
2014-08-28 3:51 ` Wu, Jingjing
2014-08-28 8:50 ` Thomas Monjalon
2014-08-28 9:01 ` Wu, Jingjing
2014-08-28 11:00 ` Thomas Monjalon
2014-08-28 11:30 ` Ananyev, Konstantin
2014-08-28 12:02 ` Thomas Monjalon
2014-09-24 4:52 ` [dpdk-dev] [PATCH v2 0/7] Support flow director programming on fortville Cao, Min
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=1409105634-29980-6-git-send-email-jingjing.wu@intel.com \
--to=jingjing.wu@intel.com \
--cc=dev@dpdk.org \
/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).