From: Yang Tse <yangsita@gmail.com>
Date: Sat, 10 Nov 2007 04:23:15 +0000 (+0000)
Subject: Some versions of winsock2.h have pollfd struct and constants
X-Git-Tag: curl-7_18_0~290
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a39839a43c3eb1e053b7761f7fee4b083d49523;p=thirdparty%2Fcurl.git

Some versions of winsock2.h have pollfd struct and constants
---

diff --git a/lib/select.h b/lib/select.h
index a97947e40d..54c7c75cfa 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