From 0ee67c5cb75e75c2a409fa58671fe15da4d8fdf4 Mon Sep 17 00:00:00 2001 From: Ludovic Rousseau Date: Mon, 18 Feb 2013 20:26:46 +0100 Subject: [PATCH] Windows: fix compiler warning libusb/os/threads_windows.c: In function 'usbi_cond_timedwait': libusb/os/threads_windows.c:190:2: warning: nested extern declaration of 'epoch_time' [-Wnested-externs] --- libusb/os/threads_windows.c | 3 ++- libusb/version_nano.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libusb/os/threads_windows.c b/libusb/os/threads_windows.c index 393d498..161553f 100644 --- a/libusb/os/threads_windows.c +++ b/libusb/os/threads_windows.c @@ -31,6 +31,8 @@ #define usbi_sleep(ms) SleepEx(ms, TRUE) #endif +extern const uint64_t epoch_time; + int usbi_mutex_init(usbi_mutex_t *mutex, const usbi_mutexattr_t *attr) { UNUSED(attr); @@ -187,7 +189,6 @@ int usbi_cond_timedwait(usbi_cond_t *cond, struct timeval targ_time, cur_time, delta_time; struct timespec cur_time_ns; DWORD millis; - extern const uint64_t epoch_time; #ifdef _WIN32_WCE SYSTEMTIME st; diff --git a/libusb/version_nano.h b/libusb/version_nano.h index abfab9c..2f97737 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10613 +#define LIBUSB_NANO 10614