From: Nick Connolly <nick.connolly@mayadata.io>
Date: Sun, 22 Nov 2020 08:45:15 +0000 (+0000)
Subject: eal/windows: fix linkage with MinGW
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=141492be9967c84ec3a41445200df8a34f5c39dd;p=dpdk.git

eal/windows: fix linkage with MinGW

Linking with the 'pci' driver when building with MinGW on
Windows fails with undefined symbol 'GUID_DEVCLASS_NET'.
This occurs because devguid.h is included in rte_windows.h
before INITGUID is defined.

Move the include of devguid.h after the definition of INITGUID.

Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers")
Cc: stable@dpdk.org

Signed-off-by: Nick Connolly <nick.connolly@mayadata.io>
Reviewed-by: Tal Shnaiderman <talshn@nvidia.com>
---

diff --git a/lib/librte_eal/windows/include/rte_windows.h b/lib/librte_eal/windows/include/rte_windows.h
index 0a5e71a054..b82af34f6d 100644
--- a/lib/librte_eal/windows/include/rte_windows.h
+++ b/lib/librte_eal/windows/include/rte_windows.h
@@ -25,13 +25,13 @@
 #include <psapi.h>
 #include <setupapi.h>
 #include <winioctl.h>
-#include <devguid.h>
 
 /* Have GUIDs defined. */
 #ifndef INITGUID
 #define INITGUID
 #endif
 #include <initguid.h>
+#include <devguid.h>
 #include <rte_log.h>
 
 /**