Windows: Fix MinGW build

The integration of UsbDk moved the windows_error_str() function to
windows_nt_common.c, but the definition of FACILITY_SETUPAPI (which
MinGW headers do not provide) did not follow the move.

Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>

diff --git a/libusb/os/windows_nt_common.h b/libusb/os/windows_nt_common.h
index ceb547b..9749e00 100644 (file)
--- a/libusb/os/windows_nt_common.h
+++ b/libusb/os/windows_nt_common.h
@@ -26,6 +26,11 @@
 
 #pragma once
 
+// Missing from MinGW
+#if !defined(FACILITY_SETUPAPI)
+#define FACILITY_SETUPAPI      15
+#endif
+
 typedef struct USB_CONFIGURATION_DESCRIPTOR {
   UCHAR  bLength;
   UCHAR  bDescriptorType;

diff --git a/libusb/os/windows_winusb.h b/libusb/os/windows_winusb.h
index d544a7f..303f4a6 100644 (file)
--- a/libusb/os/windows_winusb.h
+++ b/libusb/os/windows_winusb.h
@@ -43,11 +43,6 @@
 #define SPDRP_INSTALL_STATE    34
 #endif
 
-// Missing from MinGW
-#if !defined(FACILITY_SETUPAPI)
-#define FACILITY_SETUPAPI      15
-#endif
-
 #define MAX_CTRL_BUFFER_LENGTH 4096
 #define MAX_USB_DEVICES                256
 #define MAX_USB_STRING_LENGTH  128

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 340ae63..0336bef 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11087
+#define LIBUSB_NANO 11088