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>

diff --git a/client.c b/client.c
index 43825d9e2708aff7155242ae676eb9e5931ca49c..970974a00f274ee6e1640c84c1145c13a146c54c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>

-#include <sys/poll.h>
+#include <poll.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>

diff --git a/engines/binject.c b/engines/binject.c
index 792dbbdd2ee89da71dfb42b3382a3e4adddbc877..49042a3b15843590c5500cb28d47069fc1abc7d8 100644 (file)
--- a/engines/binject.c
+++ b/engines/binject.c
@@ -11,7 +11,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
 #include <string.h>

-#include <sys/poll.h>
+#include <poll.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 

diff --git a/engines/net.c b/engines/net.c
index 9b385b0cf035d0c90dd9640d43a7b274ad8b865f..4540e0e4d7c7eea9b9001f16cafb756225f3661a 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -13,7 +13,7 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>

-#include <sys/poll.h>
+#include <poll.h>

 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>

diff --git a/engines/rdma.c b/engines/rdma.c
index 6b173a84a197258a9e7b80f4b3205a8ccb06dc93..8def6eba0783ef4494b8b9f555974906d5ae450d 100644 (file)
--- a/engines/rdma.c
+++ b/engines/rdma.c
@@ -30,7 +30,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>

-#include <sys/poll.h>
+#include <poll.h>

 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>

diff --git a/engines/sg.c b/engines/sg.c
index 7b18c28ef2cefac49bb313b28c259b493fc01674..3d927eab857b092ed4950b7e13b7833c342c2a8e 100644 (file)
--- a/engines/sg.c
+++ b/engines/sg.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>

-#include <sys/poll.h>
+#include <poll.h>

 
 #include "../fio.h"
 #include "../optgroup.h"
 
 #include "../fio.h"
 #include "../optgroup.h"

diff --git a/engines/splice.c b/engines/splice.c
index d322f40212f57e21f1bd297a7ef9ed7ea439f0db..08fc857454ea2f82a38bf2dee3c6d91154bf1df4 100644 (file)
--- a/engines/splice.c
+++ b/engines/splice.c
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>

-#include <sys/poll.h>
+#include <poll.h>

 #include <sys/mman.h>
 
 #include "../fio.h"
 #include <sys/mman.h>
 
 #include "../fio.h"

diff --git a/os/os-hpux.h b/os/os-hpux.h
index 6a240b0d0609f5517284df389ff10d515db0f991..515a5256878a1d57f6f2fb651f05c2fa66b2af7b 100644 (file)
--- 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 <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>
 #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 db03546c9b7560e04225d129a9ddf9ecd30dc79c..2425ab9e0efd9b265e15bc24fa575fe78609ec26 100644 (file)
--- 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 <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>
 #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 17e18a1f77edef85a6a00f5eef8ac44fcea30ec8..ecc8c40885fc622c43537869f85ea9ec007d2a78 100755 (executable)
--- 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/mman.h>
 #include <sys/uio.h>
 #include <sys/resource.h>

-#include <sys/poll.h>
+#include <poll.h>

 #include <sys/wait.h>
 #include <setjmp.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 058e23adee645b42ec15e56616bf953d027aaf6d..f064e2ba4bf1afb4ce99c012e83ada864b6fef30 100644 (file)
--- a/os/windows/posix/include/poll.h
+++ b/os/windows/posix/include/poll.h
@@ -1,4 +1,15 @@
 #ifndef POLL_H
 #define POLL_H
 
 #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 */
 #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 (file)
index f009d6e..0000000
--- 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 */

diff --git a/server.c b/server.c
index 6f85810963e694129656a7640749cb52a0ed04a6..3592ab176bd8feed113f8aedd12cf4b01d3d791a 100644 (file)
--- a/server.c
+++ b/server.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>

-#include <sys/poll.h>
+#include <poll.h>

 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>