summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaofan Chen <xiaofanc@gmail.com>2012-04-14 23:17:18 +0800
committerPete Batard <pete@akeo.ie>2012-04-20 22:16:57 +0100
commit2aad19b93d64490bbf85c21c042821f2a16a0d9a (patch)
treec4863bd3d15a03143e605ca5e3cc881085f47128
parent16b7adcab9b45c9e53e15607f45717272b9a164b (diff)
downloadlibusb-2aad19b93d64490bbf85c21c042821f2a16a0d9a.tar.gz
Linux: Silence unused variable warnings without CLOCK_MONOTONIC
-rw-r--r--libusb/os/linux_usbfs.c2
-rw-r--r--libusb/version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index f2b312d..416efc4 100644
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -207,10 +207,10 @@ static const char *find_usbfs_path(void)
* seem to lack it). fall back to REALTIME if we have to. */
static clockid_t find_monotonic_clock(void)
{
+#ifdef CLOCK_MONOTONIC
struct timespec ts;
int r;
-#ifdef CLOCK_MONOTONIC
/* Linux 2.6.28 adds CLOCK_MONOTONIC_RAW but we don't use it
* because it's not available through timerfd */
r = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/libusb/version.h b/libusb/version.h
index 1b94eb6..b4386fc 100644
--- a/libusb/version.h
+++ b/libusb/version.h
@@ -9,7 +9,7 @@
#define LIBUSB_MICRO 10
#endif
#ifndef LIBUSB_NANO
-#define LIBUSB_NANO 10478
+#define LIBUSB_NANO 10479
#endif
/* LIBUSB_RC is the release candidate suffix. Should normally be empty. */
#ifndef LIBUSB_RC