diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-07-05 12:32:09 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-07-05 12:32:09 +0200 |
| commit | 70f42c744343f60ce1d50d39a7260514c059bd89 (patch) | |
| tree | c126218d69129d6303146557a9ed0bf144376e6a | |
| parent | a63d76111ddd5c9630ebc78850cddf0a9c65ef66 (diff) | |
| download | curl-bagder/inet_pton-windows.tar.gz | |
select.h: avoid macro redefinition harderbagder/inet_pton-windows
... by checking the POLLIN define, as the header file checks don't work
on Windows.
| -rw-r--r-- | lib/select.h | 5 |
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 |