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 A1A4CA0540; Wed, 15 Jul 2020 08:26:25 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 88F681C0B2; Wed, 15 Jul 2020 08:26:25 +0200 (CEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2063.outbound.protection.outlook.com [40.107.21.63]) by dpdk.org (Postfix) with ESMTP id B8FF91BFCD for ; Wed, 15 Jul 2020 08:26:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OuRDfmwxS86Fln2nZWvLFQVGfvtYnrkSOukOy2GDUIvfF0bUhjTsNW4pEY0xtDl8h+/9mBfdTx+GQrKomMLYlA9m71c5s+fhn2Y1oZZa+P75B06n4+wHASByWbOBKUIM0kqAaz7Ym7MbuCF9xKmLdXS8L6Y28e+YFahfCxNEGeCqFrR2zf8LoNPL4PeRfTTJZuoU9OnRQuuyvdxEs+7uqh1miDvfA+e8gdS4Db+PCzASLXh4CVL4NLxG0d6WPEFAN3jbZ086qiFkGqTfq+hazmjfRV4UTJ5D1mh0nKKdD8wHWA8RcWxI7U5JnSVzaDkTu9iet+1ViLNpwwElZbZDYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pXJm9lX/61MuWwZmyXSXs2P6ChtMG/yS7nwvaxozsrE=; b=mTz0FjL0jZuqaekbibnPs3M8NFozW5ayrcxu+K4miNB7nquxRyF0zcmqgEl1ZFQwH7Ec2hZLN7Cm5NgDN4xpllObuW2/azCVoMGlo1PZ9jbZfBVr863sbnIf/ifmfeRpH8eS8JcucIOtdOeOINq2cOtjxoR4PC+2xjrQiXozRvBgirOV+7SGmtEEb8C2LEmMVd0vb3h3YZDRLmoWH7VJ4JNd3ziHn6F/rCe4rGWjt6MdoDgEaSyW4MHtEUPZ5R0wZvwQ5k2MjsJCkll9Oz82SMX8gTGQDkfhIs9z1hF+n4Pi7n7O8zCiI7acl6sBZdnvekfoOHC5/Xvxq88SEIP4zQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pXJm9lX/61MuWwZmyXSXs2P6ChtMG/yS7nwvaxozsrE=; b=eCzW05IFVcKbGYXBOLFrvNcIY9/FEhj2w4hEXzchNc8oph6TV1oOoTZMbpbJip8fHwHJme5BTlw/xWMtHF2R6lQGHT+mBquxoRO4U6Tk9Lgr8Lc5loi1v8SRZHE7cOPoui2eX1fyX0jG4oe1IeLxvWpISLO//SIJA11OZGa86Ig= Received: from VI1PR05MB5872.eurprd05.prod.outlook.com (2603:10a6:803:de::17) by VI1PR05MB6078.eurprd05.prod.outlook.com (2603:10a6:803:de::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.22; Wed, 15 Jul 2020 06:26:22 +0000 Received: from VI1PR05MB5872.eurprd05.prod.outlook.com ([fe80::ec95:ae9e:77c8:63ae]) by VI1PR05MB5872.eurprd05.prod.outlook.com ([fe80::ec95:ae9e:77c8:63ae%6]) with mapi id 15.20.3174.026; Wed, 15 Jul 2020 06:26:22 +0000 From: Fady Bader To: Olivier Matz CC: "dev@dpdk.org" , Thomas Monjalon , Tasnim Bashar , Tal Shnaiderman , Yohad Tor , "dmitry.kozliuk@gmail.com" , "harini.ramakrishnan@microsoft.com" , "ocardona@microsoft.com" , "pallavi.kadam@intel.com" , "ranjit.menon@intel.com" Thread-Topic: [PATCH v3 1/3] net: fix s_addr redefinition in Windows Thread-Index: AQHWWSNTneB3XqrIOUuHs4mTd7yCGqkILyKw Date: Wed, 15 Jul 2020 06:26:22 +0000 Message-ID: References: <20200610120040.17968-1-fady@mellanox.com> <20200708082525.28504-1-fady@mellanox.com> <20200708082525.28504-2-fady@mellanox.com> <20200713143847.GQ5869@platinum> In-Reply-To: <20200713143847.GQ5869@platinum> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: 6wind.com; dkim=none (message not signed) header.d=none;6wind.com; dmarc=none action=none header.from=mellanox.com; x-originating-ip: [79.177.51.194] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 1d096f98-2e23-46e4-4e1e-08d82887fe86 x-ms-traffictypediagnostic: VI1PR05MB6078: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:281; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: yIZvN7W4p02W7n1gsaFRGCX6fbDz9L/OglL2ITjFmYCebn5ARByVR9BvRg0xvYayN24CA8sKIRCEIvuVQqlSaEwKT0LvnZjdvfDGUQktWhBPz2U5CWHkOosRkp+uu1gpQt9gaoI/ldNeNArXyDUGaqEUTyjU5Qh+VEptMeyWbTW1RCU9pyl8jBNKD6irEiLL5uNoJnNEB8dHTT0fvzEi8fIXmUy8fRSLN2Au5+rjX38cYDnvt1AFdKwVJ+ZbeEayoXVqiNzwDNo/y5Z5JwkdcW4djPlkGGvSLWg8peYBhRhfNkNy0K8TvnLRgXH3Ghc9 x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR05MB5872.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(136003)(39860400002)(376002)(366004)(396003)(346002)(54906003)(8676002)(66446008)(45080400002)(53546011)(86362001)(26005)(7696005)(8936002)(6916009)(2906002)(5660300002)(52536014)(9686003)(83380400001)(478600001)(66476007)(316002)(64756008)(66946007)(76116006)(66556008)(4326008)(186003)(6506007)(55016002)(33656002)(71200400001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: Cl966yHeNXawdPer9cMobKlQumaXxWPpYRivCqoVOR/160rNZNy+8keb+z64kMOaaj94XE2wFjAwQh9l059Nqu43vIJLcm/4n1KJorNtpYIIU2j+4hVcWQHa8CdA4/04S6D9Ctu1rTpDO2wt2DBxOeh+CpTrHnkwoZjanWDjxk8pSjRk4nLKxnQI7qElfXoUL5BDZL7668r6KHQPq++JnfheOMGOhxua89XLXcaREcHPIIhgqbRLNc/09A/sIQlITg61/AHjUP4MlSKglgGoSSdvM4sD2FS5Odp0H9l8RjtHZymy/7dBKxFg1qWl1bogEUPmK2dUD1mSOjNqObzYjvFhHPog+Wypucc7rwyjvXS5JMXU6tjrniLW+ZZ+Hp0TIjEXa7T891FvfQrqtu64SUpQxNlVrQWcsy+l0ncwe339rTitxW5VwiXZieo5NZdS5gEwVKNPYSxsSzKsPZiN2AGs9RynrIePIda/HeDFoso= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR05MB5872.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d096f98-2e23-46e4-4e1e-08d82887fe86 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jul 2020 06:26:22.7126 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: FQ2Pb/iBHpEtg+M0vTGdwEy/ajEBjDov0ouAM0rbAp6von5p6iQOQ3P8DqxXjcNeQSSGAx104Y9bizr1U3jWLQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB6078 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" > -----Original Message----- > From: Olivier Matz > Sent: Monday, July 13, 2020 5:39 PM > To: Fady Bader > Cc: dev@dpdk.org; Thomas Monjalon ; Tasnim Bashar > ; Tal Shnaiderman ; Yohad Tor > ; dmitry.kozliuk@gmail.com; > harini.ramakrishnan@microsoft.com; ocardona@microsoft.com; > pallavi.kadam@intel.com; ranjit.menon@intel.com > Subject: Re: [PATCH v3 1/3] net: fix s_addr redefinition in Windows >=20 > Hi, >=20 > On Wed, Jul 08, 2020 at 11:25:23AM +0300, Fady Bader wrote: > > s_addr in Windows is defined in windows.h so its >=20 > Is it windows.h, or is it winsock.h or winsock2.h instead? S_addr is defined in winsock2.h which is included by windows.h. >=20 > > 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 > >