From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <nhorman@tuxdriver.com>
Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58])
 by dpdk.org (Postfix) with ESMTP id 84BE46A7D
 for <dev@dpdk.org>; Tue, 30 Sep 2014 15:03:17 +0200 (CEST)
Received: from hmsreliant.think-freely.org
 ([2001:470:8:a08:7aac:c0ff:fec2:933b] helo=localhost)
 by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63)
 (envelope-from <nhorman@tuxdriver.com>)
 id 1XYxBe-00058i-Tr; Tue, 30 Sep 2014 09:09:56 -0400
Date: Tue, 30 Sep 2014 09:09:50 -0400
From: Neil Horman <nhorman@tuxdriver.com>
To: Jingjing Wu <jingjing.wu@intel.com>
Message-ID: <20140930130950.GF2193@hmsreliant.think-freely.org>
References: <1412045348-18543-1-git-send-email-jingjing.wu@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1412045348-18543-1-git-send-email-jingjing.wu@intel.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Score: -2.9 (--)
X-Spam-Status: No
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH] llib/ibrte_net: workaround to avoid macro
 conflict
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Sep 2014 13:03:17 -0000

On Tue, Sep 30, 2014 at 10:49:08AM +0800, Jingjing Wu wrote:
> Macros such as IPPROTO_TCP, IPPROTO_UDP are already defined in <netinet/in.h>.
> If user's application includes <netinet/in.h> and rte_ip.h at the same time,
> there will be conflict error.
> 
> This patch uses the way "#ifndef #endif" to avoid the conflict. 
> 
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
>  lib/librte_net/rte_ip.h | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
> index e3f65c1..2bcb479 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 */
> @@ -227,6 +229,9 @@ struct ipv4_hdr {
>  #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
> 
> 
Why define them at all?  Why not just have rte_ip.h include netinet/in.h
directly?  Its a standard include file in a standard location for both bsd and
linux IIRC.
Neil