diff options
author | Pete Batard <pbatard@gmail.com> | 2010-05-18 12:52:54 +0100 |
---|---|---|
committer | Pete Batard <pbatard@gmail.com> | 2010-05-18 12:52:54 +0100 |
commit | 9aa04bfba84f1242168a13f19c028643fa068bab (patch) | |
tree | 8564b7d3e46ba236151d8e611ff9afeb9ca1d587 | |
parent | 3ca89838af33d005c43fae96b8464e8a0996c17c (diff) | |
download | libusb-9aa04bfba84f1242168a13f19c028643fa068bab.tar.gz |
removed DDK timeval redefinitions - include winsock insteadpbr278
-rw-r--r-- | libusb/os/poll_windows.h | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/libusb/os/poll_windows.h b/libusb/os/poll_windows.h index 2009b49..fd5d27c 100644 --- a/libusb/os/poll_windows.h +++ b/libusb/os/poll_windows.h @@ -94,28 +94,11 @@ struct winfd fd_to_winfd(int fd); struct winfd handle_to_winfd(HANDLE handle); struct winfd overlapped_to_winfd(OVERLAPPED* overlapped); -// When building using the MSDDK and sources +/* + * Timeval operations + */ #if defined(DDKBUILD) -#if !defined(timeval) -struct timeval { - long tv_sec; /* seconds */ - long tv_usec; /* and microseconds */ -}; -#endif - -#if !defined(timerisset) -#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) -#endif - -#if !defined(timercmp) -#define timercmp(tvp, uvp, cmp) \ - ((tvp)->tv_sec cmp (uvp)->tv_sec || \ - (tvp)->tv_sec == (uvp)->tv_sec && (tvp)->tv_usec cmp (uvp)->tv_usec) -#endif - -#if !defined(timerclr) -#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 -#endif +#include <winsock.h> // defines timeval functions on DDK #endif #if !defined(TIMESPEC_TO_TIMEVAL) |