diff options
| author | Chris Dickens <christopher.a.dickens@gmail.com> | 2020-04-16 14:31:18 -0700 |
|---|---|---|
| committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2020-04-16 14:31:18 -0700 |
| commit | 61c457a699d211848efcbe538d949768e01b1d32 (patch) | |
| tree | dbf4c29fbd6c371298e5829b535804bc1d3216ed | |
| parent | e990e48fa85e73cd16f2f0b4b02037d8c287d22f (diff) | |
| download | libusb-61c457a699d211848efcbe538d949768e01b1d32.tar.gz | |
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 <christopher.a.dickens@gmail.com>
| -rw-r--r-- | libusb/libusb.h | 2 | ||||
| -rw-r--r-- | 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 <limits.h> #include <stdint.h> #include <sys/types.h> -#if defined(__linux__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__HAIKU__) || defined(__GLIBC__) +#if !defined(_MSC_VER) #include <sys/time.h> #endif #include <time.h> 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 |