diff options
| author | Harry Sintonen <sintonen@iki.fi> | 2020-03-30 16:52:43 +0300 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-03-31 10:59:06 +0200 |
| commit | 7a71965e9761f80aa4508472c5b1e3ab03ba018a (patch) | |
| tree | 1c2e814c559407fc853f21ffbf7e4bdd55549ee9 | |
| parent | 14dd0c020072c161827a75e3a4a236f134a8960c (diff) | |
| download | curl-7a71965e9761f80aa4508472c5b1e3ab03ba018a.tar.gz | |
build: fixed build for systems with select() in unistd.h
Closes #5169
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rwxr-xr-x | configure.ac | 2 | ||||
| -rw-r--r-- | lib/dict.c | 2 | ||||
| -rw-r--r-- | lib/select.c | 2 | ||||
| -rw-r--r-- | lib/transfer.c | 2 | ||||
| -rw-r--r-- | src/tool_operate.c | 2 | ||||
| -rw-r--r-- | src/tool_sleep.c | 2 | ||||
| -rw-r--r-- | tests/libtest/test.h | 2 |
8 files changed, 18 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 3ad55c388..089449bac 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1887,6 +1887,8 @@ struct Library *SocketBase = NULL; #endif #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> +#elif defined(HAVE_UNISTD_H) +#include <unistd.h> #endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> @@ -1950,6 +1952,8 @@ struct Library *SocketBase = NULL; #endif #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> +#elif defined(HAVE_UNISTD_H) +#include <unistd.h> #endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> diff --git a/configure.ac b/configure.ac index 31fc8ffb7..90a678ec8 100755 --- a/configure.ac +++ b/configure.ac @@ -3887,6 +3887,8 @@ dnl default includes #endif #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> +#elif defined(HAVE_UNISTD_H) +#include <unistd.h> #endif #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> diff --git a/lib/dict.c b/lib/dict.c index 208a2336f..e42165a9e 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -46,6 +46,8 @@ #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> +#elif defined(HAVE_UNISTD_H) +#include <unistd.h> #endif #include "urldata.h" diff --git a/lib/select.c b/lib/select.c index 1ab023934..857e7f698 100644 --- a/lib/select.c +++ b/lib/select.c @@ -24,6 +24,8 @@ #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> +#elif defined(HAVE_UNISTD_H) +#include <unistd.h> #endif #if !defined(HAVE_SELECT) && !defined(HAVE_POLL_FINE) diff --git a/lib/transfer.c b/lib/transfer.c index 72168336a..27c984f8f 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -48,6 +48,8 @@ #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> +#elif defined(HAVE_UNISTD_H) +#include <unistd.h> #endif #ifndef HAVE_SOCKET diff --git a/src/tool_operate.c b/src/tool_operate.c index 3c7dd6829..e1c9c6251 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -31,6 +31,8 @@ #ifdef HAVE_SYS_SELECT_H # include <sys/select.h> +#elif defined(HAVE_UNISTD_H) +# include <unistd.h> #endif #ifdef __VMS diff --git a/src/tool_sleep.c b/src/tool_sleep.c index 67a54435f..e842ba93b 100644 --- a/src/tool_sleep.c +++ b/src/tool_sleep.c @@ -23,6 +23,8 @@ #ifdef HAVE_SYS_SELECT_H # include <sys/select.h> +#elif defined(HAVE_UNISTD_H) +# include <unistd.h> #endif #ifdef HAVE_POLL_H diff --git a/tests/libtest/test.h b/tests/libtest/test.h index 4f2af415a..4806375a0 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -36,6 +36,8 @@ #ifdef HAVE_SYS_SELECT_H /* since so many tests use select(), we can just as well include it here */ #include <sys/select.h> +#elif defined(HAVE_UNISTD_H) +#include <unistd.h> #endif #ifdef TPF |