diff options
| author | Chris Dickens <christopher.a.dickens@gmail.com> | 2020-01-25 12:10:04 -0800 |
|---|---|---|
| committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2020-01-25 12:10:04 -0800 |
| commit | 7bc0ff3ce94572f3e52718938e4beb4c7a86bfff (patch) | |
| tree | d94640a7edf402b2373b5cc4cfb84881e9c4bfb6 /libusb/os/poll_windows.h | |
| parent | 221e8196221a6ede462914daf6c2652d57843df6 (diff) | |
| download | libusb-7bc0ff3ce94572f3e52718938e4beb4c7a86bfff.tar.gz | |
core: Convert internal macros to static inline functions
Older versions of the Visual Studio compiler are picky about macros
constructed with the 'do { ... } while (0)' construct. Convert these
internal ones to static inline functions. The result is functionally
equivalent but gets us type checking and a bit more readability.
Also address some compiler warnings due to some header files that are
being included in a different order than before.
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
Diffstat (limited to 'libusb/os/poll_windows.h')
| -rw-r--r-- | libusb/os/poll_windows.h | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/libusb/os/poll_windows.h b/libusb/os/poll_windows.h index c78c9d3..b2c94f9 100644 --- a/libusb/os/poll_windows.h +++ b/libusb/os/poll_windows.h @@ -67,23 +67,16 @@ int usbi_close(int fd); /* * Timeval operations */ -#if !defined(TIMESPEC_TO_TIMEVAL) -#define TIMESPEC_TO_TIMEVAL(tv, ts) \ -do { \ - (tv)->tv_sec = (long)(ts)->tv_sec; \ - (tv)->tv_usec = (long)(ts)->tv_nsec / 1000; \ -} while (0) -#endif #if !defined(timersub) -#define timersub(a, b, result) \ -do { \ - (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ - (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ - if ((result)->tv_usec < 0) { \ - --(result)->tv_sec; \ - (result)->tv_usec += 1000000; \ - } \ -} while (0) +#define timersub(a, b, result) \ + do { \ + (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ + if ((result)->tv_usec < 0L) { \ + --(result)->tv_sec; \ + (result)->tv_usec += 1000000L; \ + } \ + } while (0) #endif #endif |