summaryrefslogtreecommitdiff
path: root/os/windows/posix
diff options
context:
space:
mode:
authorSitsofe Wheeler <sitsofe@yahoo.com>2018-03-19 05:43:41 +0000
committerSitsofe Wheeler <sitsofe@yahoo.com>2018-03-21 22:09:28 +0000
commit8393ca93334319f066ce6abb44d0f4b4921abbe1 (patch)
treeeacde3b02f82c9d8b15f87f2370fcfe35c245808 /os/windows/posix
parent3d2d14bcb844e72809192311369a642c5d415472 (diff)
downloadfio-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/windows/posix')
-rw-r--r--os/windows/posix/include/poll.h11
-rw-r--r--os/windows/posix/include/sys/poll.h15
2 files changed, 11 insertions, 15 deletions
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 */