diff options
| author | Sitsofe Wheeler <sitsofe@yahoo.com> | 2018-03-19 05:43:41 +0000 |
|---|---|---|
| committer | Sitsofe Wheeler <sitsofe@yahoo.com> | 2018-03-21 22:09:28 +0000 |
| commit | 8393ca93334319f066ce6abb44d0f4b4921abbe1 (patch) | |
| tree | eacde3b02f82c9d8b15f87f2370fcfe35c245808 /os | |
| parent | 3d2d14bcb844e72809192311369a642c5d415472 (diff) | |
| download | fio-8393ca93334319f066ce6abb44d0f4b4921abbe1.tar.gz fio-8393ca93334319f066ce6abb44d0f4b4921abbe1.tar.bz2 | |
Use POSIX path for poll.h and fcntl.h headers
musl complains when using include paths like <sys/poll.h> rather than
POSIX's <poll.h> so change the poll.h include path and update the
windows poll.h compatibility shim to match.
Allegedly sys/poll.h was needed for GLIBCs that were older than 2.3
according to
https://www.winehq.org/pipermail/wine-patches/2014-June/132877.html but
I can still see that path in an ancient Red Hat 5.0
glibc-devel-2.0.7-32.i386.rpm ...
Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Diffstat (limited to 'os')
| -rw-r--r-- | os/os-hpux.h | 2 | ||||
| -rw-r--r-- | os/os-solaris.h | 2 | ||||
| -rwxr-xr-x | os/windows/posix.c | 2 | ||||
| -rw-r--r-- | os/windows/posix/include/poll.h | 11 | ||||
| -rw-r--r-- | os/windows/posix/include/sys/poll.h | 15 |
5 files changed, 14 insertions, 18 deletions
diff --git a/os/os-hpux.h b/os/os-hpux.h index 6a240b0d..515a5256 100644 --- a/os/os-hpux.h +++ b/os/os-hpux.h @@ -6,7 +6,7 @@ #include <errno.h> #include <unistd.h> #include <sys/ioctl.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <sys/fadvise.h> #include <sys/mman.h> #include <sys/mpctl.h> diff --git a/os/os-solaris.h b/os/os-solaris.h index db03546c..2425ab9e 100644 --- a/os/os-solaris.h +++ b/os/os-solaris.h @@ -7,7 +7,7 @@ #include <malloc.h> #include <unistd.h> #include <sys/types.h> -#include <sys/fcntl.h> +#include <fcntl.h> #include <sys/pset.h> #include <sys/mman.h> #include <sys/dkio.h> diff --git a/os/windows/posix.c b/os/windows/posix.c index 17e18a1f..ecc8c408 100755 --- a/os/windows/posix.c +++ b/os/windows/posix.c @@ -18,7 +18,7 @@ #include <sys/mman.h> #include <sys/uio.h> #include <sys/resource.h> -#include <sys/poll.h> +#include <poll.h> #include <sys/wait.h> #include <setjmp.h> diff --git a/os/windows/posix/include/poll.h b/os/windows/posix/include/poll.h index 058e23ad..f064e2ba 100644 --- a/os/windows/posix/include/poll.h +++ b/os/windows/posix/include/poll.h @@ -1,4 +1,15 @@ #ifndef POLL_H #define POLL_H +typedef int nfds_t; + +struct pollfd +{ + int fd; + short events; + short revents; +}; + +int poll(struct pollfd fds[], nfds_t nfds, int timeout); + #endif /* POLL_H */ diff --git a/os/windows/posix/include/sys/poll.h b/os/windows/posix/include/sys/poll.h deleted file mode 100644 index f009d6e4..00000000 --- a/os/windows/posix/include/sys/poll.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef SYS_POLL_H -#define SYS_POLL_H - -typedef int nfds_t; - -struct pollfd -{ - int fd; - short events; - short revents; -}; - -int poll(struct pollfd fds[], nfds_t nfds, int timeout); - -#endif /* SYS_POLL_H */ |