diff options
author | Steve Markgraf <steve@steve-m.de> | 2014-01-24 03:57:53 +0100 |
---|---|---|
committer | Steve Markgraf <steve@steve-m.de> | 2014-01-24 03:57:53 +0100 |
commit | a2bc5b511765b29eb0ebabbc72fa6705fde7c6f7 (patch) | |
tree | 13cc04ac2e6c97011e99a4a2e407379f356c56a7 /src | |
parent | 929972f8351622a584f0935f7c4de44f67919b80 (diff) |
lib/cmake: check for libusb_handle_events_timeout_completed()
libusb < 1.0.9 doesn't have libusb_handle_events_timeout_completed(),
but libusb <= 1.0.8 doesn't have version.h, so we need to check
for the function.
The cmake-code was borrowed from UHD, which also checks
for libusb_error_name(), we add that as well since it might come
handy later on.
Signed-off-by: Steve Markgraf <steve@steve-m.de>
Diffstat (limited to 'src')
-rw-r--r-- | src/librtlsdr.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/librtlsdr.c b/src/librtlsdr.c index f8dbc13..527f007 100644 --- a/src/librtlsdr.c +++ b/src/librtlsdr.c @@ -1775,7 +1775,11 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, } while (RTLSDR_INACTIVE != dev->async_status) { +#ifdef HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED r = libusb_handle_events_timeout_completed(dev->ctx, &tv, &dev->async_cancel); +#else + r = libusb_handle_events_timeout(dev->ctx, &tv); +#endif if (r < 0) { /*fprintf(stderr, "handle_events returned: %d\n", r);*/ if (r == LIBUSB_ERROR_INTERRUPTED) /* stray signal */ @@ -1807,7 +1811,11 @@ int rtlsdr_read_async(rtlsdr_dev_t *dev, rtlsdr_read_async_cb_t cb, void *ctx, /* handle any events that still need to * be handled before exiting after we * just cancelled all transfers */ +#ifdef HAVE_LIBUSB_HANDLE_EVENTS_TIMEOUT_COMPLETED libusb_handle_events_timeout_completed(dev->ctx, &zerotv, NULL); +#else + libusb_handle_events_timeout(dev->ctx, &zerotv); +#endif break; } } |