From 9aa04bfba84f1242168a13f19c028643fa068bab Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 18 May 2010 12:52:54 +0100 Subject: removed DDK timeval redefinitions - include winsock instead --- libusb/os/poll_windows.h | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'libusb/os') 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 // defines timeval functions on DDK #endif #if !defined(TIMESPEC_TO_TIMEVAL) -- cgit v1.2.1