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

2014-08-28 Thread Thomas Monjalon
2014-08-28 14:37, Wu, Jingjing: > Can I send a separate patch for this? > Because it has no strict relationship with flow director. Yes, please. But I think you should look at the removal option (no redefinition of at all). Thanks -- Thomas

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

2014-08-28 Thread Wu, Jingjing
> -Original Message- > From: Thomas Monjalon [mailto:thomas.monjalon at 6wind.com] > Sent: Thursday, August 28, 2014 4:56 PM > To: Wu, Jingjing > Cc: dev at dpdk.org > Subject: Re: [dpdk-dev] [PATCH v2 5/7] fix the Marco conflict > > 2014-08-28 03:39, Wu, Jin

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

2014-08-28 Thread Thomas Monjalon
2014-08-28 03:39, Wu, Jingjing: > Because these macros such as IPPROTO_TCP, IPPROTO_UDP are already > defined in . If user's application include > and rte_ip.h at the same time, there will be conflict error, for > example cmdline.c in testpmd. Yes > I remember there was someone also raised this

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

2014-08-28 Thread Wu, Jingjing
om] > Sent: Wednesday, August 27, 2014 10:28 PM > To: Wu, Jingjing > Cc: dev at dpdk.org > Subject: Re: [dpdk-dev] [PATCH v2 5/7] fix the Marco conflict > > 2014-08-27 10:13, Jingjing Wu: > > fix the Marco conflict between rte_ip.h and netinet/in.h > > Who i

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

2014-08-27 Thread Thomas Monjalon
2014-08-27 10:13, Jingjing Wu: > fix the Marco conflict between rte_ip.h and netinet/in.h Who is Marco? > +#ifndef _NETINET_IN_H > +#ifndef _NETINET_IN_H_ > /* IPv4 protocols */ > #define IPPROTO_IP 0 /**< dummy for IP */ > #define IPPROTO_HOPOPTS0 /**< IP6 hop-by-hop options */

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

2014-08-27 Thread Jingjing Wu
fix the Marco conflict between rte_ip.h and netinet/in.h Signed-off-by: jingjing.wu Reviewed-by: Helin Zhang Reviewed-by: Jing Chen Reviewed-by: Jijiang Liu --- 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/librt