From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 5 Jul 2017 10:32:09 +0000 (+0200)
Subject: select.h: avoid macro redefinition harder
X-Git-Tag: curl-7_55_0~99
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e21e5fd0c709d79ab27c65fd0afff4cf34e0da9;p=curl

select.h: avoid macro redefinition harder

... by checking the POLLIN define, as the header file checks don't work
on Windows.
---

diff --git a/lib/select.h b/lib/select.h
index 4ed5dd2f8..4351786c3 100644
--- a/lib/select.h
+++ b/lib/select.h
@@ -7,7 +7,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -36,7 +36,8 @@
 
 #if !defined(HAVE_STRUCT_POLLFD) && \
     !defined(HAVE_SYS_POLL_H) && \
-    !defined(HAVE_POLL_H)
+    !defined(HAVE_POLL_H) && \
+    !defined(POLLIN)
 
 #define POLLIN      0x01
 #define POLLPRI     0x02