aboutsummaryrefslogtreecommitdiff
path: root/src/common/fakepoll.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2003-08-12 08:18:13 +0000
committerNick Mathewson <nickm@torproject.org>2003-08-12 08:18:13 +0000
commitbbd4032fc14fb23edf7633382ed26788523ac728 (patch)
treeb750c6470d44414897d7a977ed14c7f6ba809d6f /src/common/fakepoll.c
parent25c9c837eb6fde0e7a6ef84b76602450e5672d53 (diff)
downloadtor-bbd4032fc14fb23edf7633382ed26788523ac728.tar
tor-bbd4032fc14fb23edf7633382ed26788523ac728.tar.gz
Make windows happier still
svn:r392
Diffstat (limited to 'src/common/fakepoll.c')
-rw-r--r--src/common/fakepoll.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/common/fakepoll.c b/src/common/fakepoll.c
index d2928761c..ec1201a79 100644
--- a/src/common/fakepoll.c
+++ b/src/common/fakepoll.c
@@ -28,12 +28,17 @@
int
poll(struct pollfd *ufds, unsigned int nfds, int timeout)
{
- int idx, maxfd, fd, r;
+ unsigned int idx, maxfd, fd;
+ int r;
fd_set readfds, writefds, exceptfds;
+#ifdef USING_FAKE_TIMEVAL
+#undef timeval
+#undef tv_sec
+#undef tv_usec
+#endif
struct timeval _timeout;
_timeout.tv_sec = timeout/1000;
_timeout.tv_usec = (timeout%1000)*1000;
-
FD_ZERO(&readfds);
FD_ZERO(&writefds);
FD_ZERO(&exceptfds);