summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Hjelm <hjelmn@me.com>2016-09-21 09:01:38 -0600
committerNathan Hjelm <hjelmn@me.com>2016-09-21 09:01:38 -0600
commit5fa6d3bb666ca035b627d028fbb4e0d9b8d18c6b (patch)
tree235802268770ac56e97a242de111bec73f847ec4
parent73d15d1f8eee372e0609d072f3df705f7de18214 (diff)
downloadlibusb-5fa6d3bb666ca035b627d028fbb4e0d9b8d18c6b.tar.gz
darwin: fix OSAtomicAdd32Barrier argument ordering
Signed-off-by: Nathan Hjelm <hjelmn@me.com>
-rw-r--r--libusb/os/darwin_usb.c2
-rw-r--r--libusb/version_nano.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
index b0d8a8a..c2285cd 100644
--- a/libusb/os/darwin_usb.c
+++ b/libusb/os/darwin_usb.c
@@ -52,7 +52,7 @@ _Atomic int32_t initCount = ATOMIC_VAR_INIT(0);
#include <libkern/OSAtomic.h>
/* OSAtomicAdd32Barrier returns the new value */
-#define libusb_darwin_atomic_fetch_add(x, y) (OSAtomicAdd32Barrier(x, y) - y)
+#define libusb_darwin_atomic_fetch_add(x, y) (OSAtomicAdd32Barrier(y, x) - y)
static volatile int32_t initCount = 0;
#endif
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index ccf0669..1eb7fa8 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11148
+#define LIBUSB_NANO 11149