From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9A2DBA0A03 for ; Thu, 14 Jan 2021 22:22:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8680E140E2F; Thu, 14 Jan 2021 22:22:49 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 787BC140E21; Thu, 14 Jan 2021 22:22:46 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 84A5820B7192; Thu, 14 Jan 2021 13:22:45 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 84A5820B7192 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1610659365; bh=K/+iVHvdDYVVW4ktqtkksWvKBG5hGpkDxE5f78FOZRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SERBoGkfoFqEVmyTV/SludeaGiJJfIgvNRtwmXDoYZcKSRAKpJZ3utejd788Qm8dn OYGO8dhM2xbidC7ZuhINV9AM0NW3J7CjWJcUP8YiMeGbTzpgv0R0mBtfbFqk8UAJZw rFDJqZoosydv2OH1f+Kb6+oM64uWol6Jno/rDEEk= From: Tyler Retzlaff To: dev@dpdk.org Cc: stable@dpdk.org, dmitry.kozliuk@gmail.com Date: Thu, 14 Jan 2021 13:22:35 -0800 Message-Id: <1610659355-31330-1-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610491311-4079-1-git-send-email-roretzla@linux.microsoft.com> References: <1610491311-4079-1-git-send-email-roretzla@linux.microsoft.com> Subject: [dpdk-stable] [PATCH v3] pci/windows: fix build with SDK >= 10.0.20253 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" NetUIO device class and interface GUIDs are defined in system headers starting from platform SDK v10.0.20253. Inspect SDK version to avoid redefinition. Pre-release SDKs do not promise compatibility and a narrow subset of SDKs may still be subject to redefinition. Fixes: c76ec01b4591 (bus/pci: support netuio on Windows) Cc: stable@dpdk.org Signed-off-by: Tyler Retzlaff --- drivers/bus/pci/windows/pci_netuio.c | 6 ++++++ drivers/bus/pci/windows/pci_netuio.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/drivers/bus/pci/windows/pci_netuio.c b/drivers/bus/pci/windows/pci_netuio.c index 670194839..1bf9133f7 100644 --- a/drivers/bus/pci/windows/pci_netuio.c +++ b/drivers/bus/pci/windows/pci_netuio.c @@ -7,6 +7,12 @@ #include #include +#ifdef __MINGW32__ +#include +#else +#include +#endif + #include "private.h" #include "pci_netuio.h" diff --git a/drivers/bus/pci/windows/pci_netuio.h b/drivers/bus/pci/windows/pci_netuio.h index 9a77806b5..2f6c97ea7 100644 --- a/drivers/bus/pci/windows/pci_netuio.h +++ b/drivers/bus/pci/windows/pci_netuio.h @@ -5,6 +5,7 @@ #ifndef _PCI_NETUIO_H_ #define _PCI_NETUIO_H_ +#if !defined(NTDDI_WIN10_FE) || NTDDI_VERSION < NTDDI_WIN10_FE /* GUID definition for device class netUIO */ DEFINE_GUID(GUID_DEVCLASS_NETUIO, 0x78912bc1, 0xcb8e, 0x4b28, 0xa3, 0x29, 0xf3, 0x22, 0xeb, 0xad, 0xbe, 0x0f); @@ -12,6 +13,7 @@ DEFINE_GUID(GUID_DEVCLASS_NETUIO, 0x78912bc1, 0xcb8e, 0x4b28, /* GUID definition for the netuio device interface */ DEFINE_GUID(GUID_DEVINTERFACE_NETUIO, 0x08336f60, 0x0679, 0x4c6c, 0x85, 0xd2, 0xae, 0x7c, 0xed, 0x65, 0xff, 0xf7); +#endif /* IOCTL code definitions */ #define IOCTL_NETUIO_MAP_HW_INTO_USERSPACE \ -- 2.29.0.vfs.0.0