diff options
| author | Evan Miller <emmiller@gmail.com> | 2021-11-06 19:42:53 -0400 |
|---|---|---|
| committer | Tormod Volden <debian.tormod@gmail.com> | 2021-11-07 11:38:03 +0100 |
| commit | 8fa0582438d9b624eb5d2c6d0d71821e20897479 (patch) | |
| tree | a9fd3a870de4ead19b9cc6af453f4f171ca37919 | |
| parent | f33c9562a1dd7a0cb333fcd9a670ba14fbbfbc0e (diff) | |
| download | libusb-8fa0582438d9b624eb5d2c6d0d71821e20897479.tar.gz | |
darwin: Fix compilation on macOS 10.9 and earlier
kUSBReEnumerateCaptureDeviceMask was introduced in the 10.10 SDK, so
compiling on 10.9 and earlier will fail with:
os/darwin_usb.c: In function 'darwin_reenumerate_device':
os/darwin_usb.c:1749:18: error: 'kUSBReEnumerateCaptureDeviceMask' undeclared (first use in this function); did you mean 'USBReEnumerateOptions'?
options |= kUSBReEnumerateCaptureDeviceMask;
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
USBReEnumerateOptions
os/darwin_usb.c:1749:18: note: each undeclared identifier is reported only once for each function it appears in
Downstream report: https://trac.macports.org/ticket/63668
Closes #1023
| -rw-r--r-- | libusb/os/darwin_usb.c | 2 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c index 10af647..15457f7 100644 --- a/libusb/os/darwin_usb.c +++ b/libusb/os/darwin_usb.c @@ -1758,7 +1758,9 @@ static int darwin_reenumerate_device (struct libusb_device_handle *dev_handle, b /* if we need to release capture */ if (HAS_CAPTURE_DEVICE()) { if (capture) { +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 options |= kUSBReEnumerateCaptureDeviceMask; +#endif } } else { capture = false; diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 3c45733..1033492 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11670 +#define LIBUSB_NANO 11671 |