From 8393ca93334319f066ce6abb44d0f4b4921abbe1 Mon Sep 17 00:00:00 2001 From: Sitsofe Wheeler Date: Mon, 19 Mar 2018 05:43:41 +0000 Subject: Use POSIX path for poll.h and fcntl.h headers musl complains when using include paths like rather than POSIX's 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 --- os/windows/posix/include/poll.h | 11 +++++++++++ os/windows/posix/include/sys/poll.h | 15 --------------- 2 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 os/windows/posix/include/sys/poll.h (limited to 'os/windows/posix/include') 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 */ -- cgit v1.2.3