Check for struct pollfd separately from poll, needed for WinNT 6

configure.ac

@@ -596,6 +596,17 @@ AC_SEARCH_LIBS(poll, [poll], [
   ])
 ])
 
+dnl Check for struct pollfd
+AC_CHECK_TYPES([struct pollfd],,,
+[#include <sys/types.h>
+#if HAVE_POLL
+# include <poll.h>
+#elif defined (WIN32)
+# include <winsock2.h>
+#endif
+])
+
+dnl Check for connect
 LIBS_save="$LIBS"
 SOCKET_LIBS=""
 AC_SEARCH_LIBS(connect, [socket], [

include/vlc_fixups.h

@@ -252,7 +252,7 @@ void swab (const void *, void *, ssize_t);
 # define inet_ntop vlc_inet_ntop
 #endif
 
-#ifndef HAVE_POLL
+#ifndef HAVE_STRUCT_POLLFD
 enum
 {
     POLLIN=1,
@@ -269,7 +269,8 @@ struct pollfd
     unsigned events;
     unsigned revents;
 };
-
+#endif
+#ifndef HAVE_POLL
 # define poll(a, b, c) vlc_poll(a, b, c)
 #elif defined (HAVE_MAEMO)
 # include <poll.h>