summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-07-05 12:32:09 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-07-05 13:28:28 +0200
commit7e21e5fd0c709d79ab27c65fd0afff4cf34e0da9 (patch)
tree0526fe887b1c07b03221f1785ec0392c849745cf
parent21e0705734b90170bfb9dcdc642a9c0743e2a1b1 (diff)
downloadcurl-7e21e5fd0c709d79ab27c65fd0afff4cf34e0da9.tar.gz
select.h: avoid macro redefinition harder
... by checking the POLLIN define, as the header file checks don't work on Windows.
-rw-r--r--lib/select.h5
1 files changed, 3 insertions, 2 deletions
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