libusbi.h: fix warning about redefined macros

In macOS 11.x the USEC_PER_SEC and NSEC_PER_SEC are defined by a system
header. The values are the same so use the system defines if they are
available.

Signed-off-by: Nathan Hjelm <hjelmn@google.com>

diff --git a/libusb/libusbi.h b/libusb/libusbi.h
index c4e705fdc2d4891a785616786eeadae40d36d381..a3c361bce13d7b848fe1f34f4551c2f2eb883c45 100644 (file)
--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
@@ -3,7 +3,7 @@
  * Copyright © 2007-2009 Daniel Drake <dsd@gentoo.org>
  * Copyright © 2001 Johannes Erdfelt <johannes@erdfelt.com>
  * Copyright © 2019 Nathan Hjelm <hjelmn@cs.umm.edu>
- * Copyright © 2019 Google LLC. All rights reserved.
+ * Copyright © 2019-2020 Google LLC. All rights reserved.
  * Copyright © 2020 Chris Dickens <christopher.a.dickens@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -228,8 +228,13 @@ static inline void *usbi_reallocf(void *ptr, size_t size)
        return ret;
 }
 
+#if !defined(USEC_PER_SEC)
 #define USEC_PER_SEC   1000000L
+#endif
+
+#if !defined(NSEC_PER_SEC)
 #define NSEC_PER_SEC   1000000000L
+#endif
 
 #define TIMEVAL_IS_VALID(tv)                                           \
        ((tv)->tv_sec >= 0 &&                                           \

diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 4b21d4e80d4a7f8b23dbbe0fe47769b7966dda35..17159e00387344f1152ddb62b4e4f900ffbada8c 100644 (file)
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11560
+#define LIBUSB_NANO 11564