netapi32: Revert "janitorial: Use poll() instead of select()."

As Juan Lang pointed out, fd is a SOCKET here and the netapi32 call to select calls ws2_32.WS_select(), which uses poll internally already.

netapi32: Revert "janitorial: Use poll() instead of select()."
65686b58 · Kai Blin · Alexandre Julliard · 14987e40 · 65686b58
Commit 65686b58 authored Mar 24, 2008 by Kai Blin Committed by Alexandre Julliard Mar 24, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 13 deletions

nbt.c dlls/netapi32/nbt.c +5 -13

No files found.
--- a/dlls/netapi32/nbt.c
+++ b/dlls/netapi32/nbt.c
@@ -67,15 +67,6 @@

 #include "config.h"
 #include <stdarg.h>
-#ifdef HAVE_POLL_H
-#include <poll.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif

 #include "winsock2.h"
 #include "windef.h"
@@ -311,12 +302,13 @@ static UCHAR NetBTWaitForNameResponse(const NetBTAdapter *adapter, SOCKET fd,
    while (!found && ret == NRC_GOODRET && (now = GetTickCount()) < waitUntil)
    {
        DWORD msToWait = waitUntil - now;
-        struct pollfd pfd;
+        struct fd_set fds;
+        struct timeval timeout = { msToWait / 1000, msToWait % 1000 };
        int r;

-        pfd.fd = fd;
-        pfd.events = POLLIN;
-        r = poll(&pfd, 1, msToWait);
+        FD_ZERO(&fds);
+        FD_SET(fd, &fds);
+        r = select(fd + 1, &fds, NULL, NULL, &timeout);
        if (r < 0)
            ret = NRC_SYSTEM;
        else if (r == 1)