From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 357EEA0540; Mon, 13 Jul 2020 16:38:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 094C11D8D7; Mon, 13 Jul 2020 16:38:51 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 3E5DF1D734 for ; Mon, 13 Jul 2020 16:38:50 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id f18so13408158wml.3 for ; Mon, 13 Jul 2020 07:38:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=foh8SMIycjpRBDOPEkjrhcnkDbZ70mMjimIulUjuPTQ=; b=TbKd2eq0a+LPOoR+jiVF8ttXpol4QNOHysZikm5HB0K7u+TWquJkSWX9tcAHSOGpLe qtcAyynx4UuHf8WXbg2SSb4WjidDTu3YVUY1lQKOes7oUk2I72fSmVHXNZ3AzPESpkxq 1hPNGmi+2xFoeEsrwL0ob/e+7SqfvohsWdnSr3u93xSSqzVwDCR1zNq50xoWaUuEpFDP ugJZi8wnjvDftr5kxFXGQVirIVghG+NGC9wA5tHu/eIpaDW3qZOcHijiFNs17yYZM6Vp 1Aq826oTAaFJsZGPsYDFq1wpslg5Y1jDXDWONaY+FuY++uRjRCRG/JrVlG7zLlVW7blq OG+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=foh8SMIycjpRBDOPEkjrhcnkDbZ70mMjimIulUjuPTQ=; b=Kg682+kVf45CHVQhVLZkhNLqKRnpzHLldkouJnnGTK6jDTQpcBsuP5BOybGLR/rREA H0FtueOr3NxFmAczMxpA3qWddIQrZlbmXLqtz93n51oDDI0Ah8KgjvD/LIwHWqt9W5a/ QFh01yxBfAwIR9EyVT0rdhjp4AEV4xZYeH00lx5TthxSYJfYgY1RgcRlKJyzmmaUwhwO a8ZgejTvpKzDFh4DMHvn2wkymt6yKYtKDjfHEwP0OQ+yXllBX7XWMLH+8i9jTDRVKAdN M3TYPizqRIiHXKGjUFItXVYtdVwG+WWsEtBY+cnAZuDCwzcj6q9pr7n7iNHR1ZpKs3EL LfBw== X-Gm-Message-State: AOAM532f0v4mQAiqSpO8cOiEJt/1+zKZDAr0S2P5+Q8CZ0DbbEGixMAP TDKS6mMvl/QFHyku4O1xSGFstQ== X-Google-Smtp-Source: ABdhPJwd8Nc2jeA15wiR2XrqpjzxRb5FyPduR2yEOQZC8Dmq0JYmqXvRXnDb3LmUfgRw2jjhN9iUnw== X-Received: by 2002:a1c:5459:: with SMTP id p25mr265140wmi.148.1594651129098; Mon, 13 Jul 2020 07:38:49 -0700 (PDT) Received: from 6wind.com (2a01cb0c0005a600345636f7e65ed1a0.ipv6.abo.wanadoo.fr. [2a01:cb0c:5:a600:3456:36f7:e65e:d1a0]) by smtp.gmail.com with ESMTPSA id x1sm23396303wrp.10.2020.07.13.07.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 07:38:48 -0700 (PDT) Date: Mon, 13 Jul 2020 16:38:47 +0200 From: Olivier Matz To: Fady Bader Cc: dev@dpdk.org, thomas@monjalon.net, tbashar@mellanox.com, talshn@mellanox.com, yohadt@mellanox.com, dmitry.kozliuk@gmail.com, harini.ramakrishnan@microsoft.com, ocardona@microsoft.com, pallavi.kadam@intel.com, ranjit.menon@intel.com Message-ID: <20200713143847.GQ5869@platinum> References: <20200610120040.17968-1-fady@mellanox.com> <20200708082525.28504-1-fady@mellanox.com> <20200708082525.28504-2-fady@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200708082525.28504-2-fady@mellanox.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [dpdk-dev] [PATCH v3 1/3] net: fix s_addr redefinition in Windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi, On Wed, Jul 08, 2020 at 11:25:23AM +0300, Fady Bader wrote: > s_addr in Windows is defined in windows.h so its Is it windows.h, or is it winsock.h or winsock2.h instead? > undefined in order to be defined as part of rte_ether_hdr. > > Signed-off-by: Fady Bader > --- > lib/librte_net/rte_ether.h | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h > index 0ae4e75b6c..f6e37d9e5e 100644 > --- a/lib/librte_net/rte_ether.h > +++ b/lib/librte_net/rte_ether.h > @@ -23,6 +23,15 @@ extern "C" { > #include > #include > > +/* > + * s_addr in windows is defined in windows.h > + * it is undefined here to be defined as part of rte_ether_hdr > + */ > +#ifdef RTE_EXEC_ENV_WINDOWS > +#undef s_addr > +#endif > + > + > #define RTE_ETHER_ADDR_LEN 6 /**< Length of Ethernet address. */ > #define RTE_ETHER_TYPE_LEN 2 /**< Length of Ethernet type field. */ > #define RTE_ETHER_CRC_LEN 4 /**< Length of Ethernet CRC. */ > -- > 2.16.1.windows.4 >