RPCS3/archived-libusb
1
0
Fork 0
mirror of https://github.com/RPCS3/libusb.git synced 2026-01-31 01:25:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

darwin: Untangle clock_* API tests from atomics tests

Browse Source 
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
This commit is contained in:
Sean McBride
2017-12-29 13:23:51 -05:00
committed by Chris Dickens
parent 860657126e
commit d2ebbf793c
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libusb/os/darwin_usb.c
View File

@@ -45,7 +45,6 @@
/* Apple deprecated the darwin atomics in 10.12 in favor of C11 atomics */
#include <stdatomic.h>
#define libusb_darwin_atomic_fetch_add(x, y) atomic_fetch_add(x, y)
#define OSX_USE_CLOCK_GETTIME 1
_Atomic int32_t initCount = ATOMIC_VAR_INIT(0);
#else
@@ -57,6 +56,12 @@ _Atomic int32_t initCount = ATOMIC_VAR_INIT(0);
static volatile int32_t initCount = 0;
#endif
/* On 10.12 and later, use newly available clock_*() functions */
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
#define OSX_USE_CLOCK_GETTIME 1
#else
#define OSX_USE_CLOCK_GETTIME 0
#endif

2
libusb/version_nano.h
View File

@@ -1 +1 @@
#define LIBUSB_NANO 11281
#define LIBUSB_NANO 11282