library: Update GCC build for MinGW 7.0.0

Same includes for 32-bit as for 64-bit. Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
mcuee · Feb 27, 2023 · 56bb429 · 56bb429
1 parent f0fdc47
commit 56bb429
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/libusb/src/install.c b/libusb/src/install.c
@@ -30,15 +30,9 @@
 #include <richedit.h>
 #include <conio.h>
 #include <ctype.h>
-
-#ifdef __GNUC__
-#if  defined(_WIN64)
-#include <cfgmgr32.h>
-#else
-#include <ddk/cfgmgr32.h>
-#endif
-#else
 #include <cfgmgr32.h>
+
+#ifndef __GNUC__
 #define strlwr(p) _strlwr(p)
 #endif
 

diff --git a/libusb/src/install_filter_win.c b/libusb/src/install_filter_win.c
@@ -20,15 +20,9 @@
 #define INITGUID
 
 #include <windows.h>
+#include <cfgmgr32.h>
 
-#ifdef __GNUC__
-	#if  defined(_WIN64)
-		#include <cfgmgr32.h>
-	#else
-		#include <ddk/cfgmgr32.h>
-	#endif
-#else
-	#include <cfgmgr32.h>
+#ifndef __GNUC__
 	#define strlwr(p) _strlwr(p)
 #endif
 

diff --git a/libusb/src/registry.c b/libusb/src/registry.c
@@ -23,15 +23,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#ifdef __GNUC__
-#if  defined(_WIN64)
-#include <cfgmgr32.h>
-#else
-#include <ddk/cfgmgr32.h>
-#endif
-#else
 #include <cfgmgr32.h>
+
+#ifndef __GNUC__
 #define strlwr(p) _strlwr(p)
 #endif