From 00afa2a3287c2c418ac8ac7739712e8d0b7e66c9 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Mon, 16 Mar 2015 16:44:27 -0700 Subject: [PATCH] Patch libusb to compile on vs2015. --- Externals/libusb/libusb/os/threads_windows.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Externals/libusb/libusb/os/threads_windows.h b/Externals/libusb/libusb/os/threads_windows.h index 2b829253b4..b28da25555 100644 --- a/Externals/libusb/libusb/os/threads_windows.h +++ b/Externals/libusb/libusb/os/threads_windows.h @@ -43,11 +43,16 @@ typedef struct usbi_cond_t_ usbi_cond_t; // We *were* getting timespec from pthread.h: #if (!defined(HAVE_STRUCT_TIMESPEC) && !defined(_TIMESPEC_DEFINED)) #define HAVE_STRUCT_TIMESPEC 1 +// (shuffle2) see https://github.com/libusb/libusb/pull/60 +#if defined(_MSC_VER) && (_MSC_VER >= 1900) +#include +#else #define _TIMESPEC_DEFINED 1 struct timespec { long tv_sec; long tv_nsec; }; +#endif #endif /* HAVE_STRUCT_TIMESPEC | _TIMESPEC_DEFINED */ // We *were* getting ETIMEDOUT from pthread.h: