From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by dpdk.org (Postfix) with ESMTP id 680C9682E for ; Wed, 27 Aug 2014 16:23:47 +0200 (CEST) Received: by mail-we0-f180.google.com with SMTP id w61so310668wes.11 for ; Wed, 27 Aug 2014 07:27:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding:content-type; bh=ojjAcQmV59A7Q6Qe8rxtjVYSAIYaJ87MWG/w8gx7UYg=; b=YkVossB1LtRa/Qw7tZGybZ4QXlZz/E2EmqkSnumpA2npbZIdYDXDYMY6dhGv2yzWBa 3xf8+cj3cOJoZGrVCA7ks5RzfVPiVbs4I83M3CjBtQ1b7toOuFXuqS4v2q2uxyVjSmWC MNn0DZd7ogGh+2ffSPOECDie0flgAd0u8fBtBOxD3vGlkV6wsDHbrPSCOFP6SAGOVeMq 5vOxN3YFYFsya/MZGhYTPApIhW7Ch7ugawGUQIuhdZTehr6Vf8jhou3upeIVjaQBD0mY 5Hdj/3KXBvXkoOWOcVmNoC0OSDf67VaFFm94oL2EXKS37LyDLslrslviER2XJtfFw04D HzJQ== X-Gm-Message-State: ALoCoQl6gW3P4TvXQHGVtMEvCPQLaOHF0qrjHSfabI+07YvtxMlnT1KiR7WD7pLrllet3b97GoPc X-Received: by 10.194.80.9 with SMTP id n9mr38063463wjx.57.1409149671995; Wed, 27 Aug 2014 07:27:51 -0700 (PDT) Received: from xps13.localnet (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id pc6sm1423074wjb.43.2014.08.27.07.27.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Aug 2014 07:27:51 -0700 (PDT) From: Thomas Monjalon To: Jingjing Wu Date: Wed, 27 Aug 2014 16:27:47 +0200 Message-ID: <9091956.EmWA3cIqCF@xps13> Organization: 6WIND User-Agent: KMail/4.13.3 (Linux/3.15.8-1-ARCH; KDE/4.13.3; x86_64; ; ) In-Reply-To: <1409105634-29980-6-git-send-email-jingjing.wu@intel.com> References: <1409105634-29980-1-git-send-email-jingjing.wu@intel.com> <1409105634-29980-6-git-send-email-jingjing.wu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Cc: dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH v2 5/7] fix the Marco conflict X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Aug 2014 14:23:47 -0000 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_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 */ Please explain your "fix" (which seems to be a workaround). -- Thomas