X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=f253dbd8e9e98760b290841cff789917aa7cf942;hb=4b9e2532135a07cfda6e2ac7a68c69486411b2b7;hp=44aa59ed729afb4c101d29957b931ca4b78f8e64;hpb=2defc4116b57a73a69c1ad284a22bd2b2f7d8c68;p=libsigrok.git diff --git a/src/session.c b/src/session.c index 44aa59ed..f253dbd8 100644 --- a/src/session.c +++ b/src/session.c @@ -409,7 +409,7 @@ static int sr_session_iteration(struct sr_session *session) struct source *source; GPollFD *pollfd; gintptr poll_object; -#if HAVE_LIBUSB_1_0 && !defined(G_OS_WIN32) +#if HAVE_LIBUSB_1_0 int64_t usb_timeout; int64_t usb_due; struct timeval tv; @@ -427,7 +427,7 @@ static int sr_session_iteration(struct sr_session *session) min_due = source->due; source->triggered = FALSE; } -#if HAVE_LIBUSB_1_0 && !defined(G_OS_WIN32) +#if HAVE_LIBUSB_1_0 usb_due = INT64_MAX; if (session->ctx->usb_source_present) { ret = libusb_get_next_timeout(session->ctx->libusb_ctx, &tv); @@ -506,7 +506,7 @@ static int sr_session_iteration(struct sr_session *session) revents = 0; due = source->due; -#if HAVE_LIBUSB_1_0 && !defined(G_OS_WIN32) +#if HAVE_LIBUSB_1_0 if (usb_due < due && poll_object == (gintptr)session->ctx->libusb_ctx) due = usb_due;