From 61c457a699d211848efcbe538d949768e01b1d32 Mon Sep 17 00:00:00 2001 From: Chris Dickens Date: Thu, 16 Apr 2020 14:31:18 -0700 Subject: libusb.h: Simplify condition governing the inclusion of sys/time.h The expression for the condition grows each time a new backend is added, but it can be simplified if changed to key off of the _MSC_VER macro. The sys/time.h header is ubiquitous across all platforms and build environments except Visual Studio, so change the condition to be based on this. This fixes builds on BSD where the condition was not evaluating to true. Signed-off-by: Chris Dickens --- libusb/libusb.h | 2 +- libusb/version_nano.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libusb/libusb.h b/libusb/libusb.h index 2452d73..058569e 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -38,7 +38,7 @@ typedef SSIZE_T ssize_t; #include #include #include -#if defined(__linux__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__HAIKU__) || defined(__GLIBC__) +#if !defined(_MSC_VER) #include #endif #include diff --git a/libusb/version_nano.h b/libusb/version_nano.h index ac0929f..0e6fc9c 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11495 +#define LIBUSB_NANO 11496 -- cgit v1.2.1