summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Hjelm <hjelmn@me.com>2016-09-07 18:50:43 -0600
committerNathan Hjelm <hjelmn@me.com>2016-09-07 18:50:43 -0600
commit756cc2b5d1558cb7ef59f73d4246f50c4f18824a (patch)
tree1d9ea9fcdc18f495ede4a22581fbd9164e9c2a65
parentaa1d76cd13ae8f8fac696ab2c3204d3f39c77c4c (diff)
downloadlibusb-756cc2b5d1558cb7ef59f73d4246f50c4f18824a.tar.gz
darwin: do not use objc_registerThreadWithCollector where deprecated
This commit updates the check around objc_registerThreadWithCollector to enable the call only between 10.6 (introduced) and 10.8 (deprecated). Signed-off-by: Nathan Hjelm <hjelmn@me.com>
-rw-r--r--libusb/os/darwin_usb.c2
-rw-r--r--libusb/version_nano.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index ef163ff..c2b2263 100644
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -373,7 +373,7 @@ static void *darwin_event_thread_main (void *arg0) {
/* Set this thread's name, so it can be seen in the debugger
and crash reports. */
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 && MAC_OS_X_VERSION_MIN_REQUIRED <= 1080
pthread_setname_np ("org.libusb.device-hotplug");
/* Tell the Objective-C garbage collector about this thread.
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 2074f55..d8b7bd4 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11141
+#define LIBUSB_NANO 11142