diff options
| author | Pete Batard <pete@akeo.ie> | 2011-09-12 12:48:22 +0100 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2011-09-12 12:48:22 +0100 |
| commit | 5f950c84feff96c942ec63bd3b0041f944e8fefc (patch) | |
| tree | 91fbbc5bed962d4638d73757a13ab911d66f575a | |
| parent | 3209815810a7e1deb6cb961a4dac01b9cfb64d7d (diff) | |
| download | libusb-5f950c84feff96c942ec63bd3b0041f944e8fefc.tar.gz | |
[MinGW] fix that annoying timercmp warning in io.c
* MinGW was issuing a "suggest parenthesis" warning with timercmp
| -rw-r--r-- | libusb/io.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libusb/io.c b/libusb/io.c index d0112a1..43e683b 100644 --- a/libusb/io.c +++ b/libusb/io.c @@ -36,6 +36,10 @@ #include "libusbi.h" +/* The timercmp from MinGW's _timeval.h produces a warning */ +#define libusb_timercmp(a, b, CMP) (((a)->tv_sec == (b)->tv_sec) ? \ + ((a)->tv_usec CMP (b)->tv_usec):((a)->tv_sec CMP (b)->tv_sec)) + /** * \page io Synchronous and asynchronous device I/O * @@ -1917,7 +1921,7 @@ static int get_next_timeout(libusb_context *ctx, struct timeval *tv, return 1; /* choose the smallest of next URB timeout or user specified timeout */ - if (timercmp(&timeout, tv, <)) + if (libusb_timercmp(&timeout, tv, <)) *out = timeout; else *out = *tv; @@ -2156,7 +2160,7 @@ int API_EXPORTED libusb_get_next_timeout(libusb_context *ctx, } TIMESPEC_TO_TIMEVAL(&cur_tv, &cur_ts); - if (!timercmp(&cur_tv, next_timeout, <)) { + if (!libusb_timercmp(&cur_tv, next_timeout, <)) { usbi_dbg("first timeout already expired"); timerclear(tv); } else { |