[2/2] pci/windows: fix build with MinGW-w64 8.0.0
diff mbox series

Message ID 20201201163959.9590-2-dmitry.kozliuk@gmail.com
State Accepted
Delegated to: Thomas Monjalon
Headers show
Series
  • [1/2] eal/windows: fix build with MinGW-w64 8.0.0
Related show

Checks

Context Check Description
ci/travis-robot success Travis build: passed
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Dmitry Kozlyuk Dec. 1, 2020, 4:39 p.m. UTC
Fix redefinition of GUID, missing from previous versions.

Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers")
Cc: stable@dpdk.org
Cc: Tal Shnaiderman <talshn@mellanox.com>

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
---
 drivers/bus/pci/windows/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Monjalon Dec. 7, 2020, 1:56 p.m. UTC | #1
01/12/2020 17:39, Dmitry Kozlyuk:
> Fix redefinition of GUID, missing from previous versions.
> 
> Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers")
> Cc: stable@dpdk.org
> Cc: Tal Shnaiderman <talshn@mellanox.com>
> 
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>

For both patches:
Tested-by: Thomas Monjalon <thomas@monjalon.net>

Thanks
Thomas Monjalon Dec. 7, 2020, 5:28 p.m. UTC | #2
07/12/2020 14:56, Thomas Monjalon:
> 01/12/2020 17:39, Dmitry Kozlyuk:
> > Fix redefinition of GUID, missing from previous versions.
> > 
> > Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers")
> > Cc: stable@dpdk.org
> > Cc: Tal Shnaiderman <talshn@mellanox.com>
> > 
> > Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> 
> For both patches:
> Tested-by: Thomas Monjalon <thomas@monjalon.net>

Series applied, thanks.

Patch
diff mbox series

diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
index b450346bd..33a5fb1d8 100644
--- a/drivers/bus/pci/windows/pci.c
+++ b/drivers/bus/pci/windows/pci.c
@@ -11,7 +11,7 @@ 
 
 #include <devpkey.h>
 
-#ifdef RTE_TOOLCHAIN_GCC
+#if defined RTE_TOOLCHAIN_GCC && (__MINGW64_VERSION_MAJOR < 8)
 #include <devpropdef.h>
 DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40, 0x45bc,
 	0xa8, 0xa2, 0x6a, 0x0b, 0x89, 0x4c, 0xbd, 0xa2, 3);