diff --git a/lib/select.h b/lib/select.h
index a97947e40dc50f69e427b100515efd7c198009b9..54c7c75cfada15272e239b63f5d5f8042857ff2e 100644
--- a/lib/select.h
+++ b/lib/select.h
@@ -40,13 +40,16 @@
 #undef  HAVE_POLL_FINE
 #define HAVE_POLL_FINE 1
 #define poll(x,y,z) WSAPoll((x),(y),(z))
+#if defined(_MSC_VER) && defined(POLLRDNORM)
+#define HAVE_STRUCT_POLLFD 1
+#endif
 #endif
 
 /*
  * Definition of pollfd struct and constants for platforms lacking them.
  */
 
-#ifndef HAVE_SYS_POLL_H
+#if !defined(HAVE_STRUCT_POLLFD) && !defined(HAVE_SYS_POLL_H)
 
 #define POLLIN      0x01
 #define POLLPRI     0x02