Fix location of various standard header includes

poll.h, signal.h, errno.h and fcntl.h are all defined in POSIX
and their location are not under sys/

This fixes various compile warning when building with musl libc like:

In file included from clnt_dg.c:40:0:
/usr/include/sys/poll.h:1:2: warning: #warning redirecting
incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]

In file included from clnt_generic.c:32:0:
/usr/include/sys/fcntl.h:1:2: warning: #warning redirecting
incorrect #include <sys/fcntl.h> to <fcntl.h> [-Wcpp]

In file included from auth_time.c:34:0:
/usr/include/sys/signal.h:1:2: warning: #warning redirecting
incorrect #include <sys/signal.h> to <signal.h> [-Wcpp]

In file included from auth_time.c:35:0:
/usr/include/sys/errno.h:1:2: warning: #warning redirecting
incorrect #include <sys/errno.h> to <errno.h> [-Wcpp]

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/src/auth_time.c b/src/auth_time.c
index ace86bffff9682aacf52336cee3b27ffb635bfd7..13717ff6f19335e2d8124583c69dd9226945a16a 100644 (file)
--- a/src/auth_time.c
+++ b/src/auth_time.c
@@ -31,8 +31,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <netdb.h>
-#include <sys/signal.h>
-#include <sys/errno.h>
+#include <signal.h>
+#include <errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

diff --git a/src/clnt_bcast.c b/src/clnt_bcast.c
index 194a738c7f011eb620ab4f45d75206ce723bb08d..25e72fdb6483775ef131c14cd6b0a7f907981583 100644 (file)
--- a/src/clnt_bcast.c
+++ b/src/clnt_bcast.c
@@ -45,7 +45,7 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <ifaddrs.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <rpc/rpc.h>
 #ifdef PORTMAP
 #include <rpc/pmap_prot.h>

diff --git a/src/clnt_dg.c b/src/clnt_dg.c
index dcc621ca911add19ee7683b6e9767dea83f2eb31..248138bbafc75e016604dbc7e1b9ab0eed7f76ac 100644 (file)
--- a/src/clnt_dg.c
+++ b/src/clnt_dg.c
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdint.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include <sys/time.h>
 

diff --git a/src/clnt_generic.c b/src/clnt_generic.c
index b9b07bcf396e1065b5222e7c07c32a1537b8d22f..3f3dabffcc1f2b5556fa36b1f1fab2ca2308992c 100644 (file)
--- a/src/clnt_generic.c
+++ b/src/clnt_generic.c
@@ -29,7 +29,7 @@
 #include <pthread.h>
 #include <reentrant.h>
 #include <sys/types.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

diff --git a/src/clnt_vc.c b/src/clnt_vc.c
index 61264d448941752b21d141dc7317bcd392b8ee8e..a72f9f7abc3eb207946856206b317c0ba63453ab 100644 (file)
--- a/src/clnt_vc.c
+++ b/src/clnt_vc.c
@@ -48,7 +48,7 @@
 
 #include <reentrant.h>
 #include <sys/types.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/syslog.h>
 #include <sys/un.h>
 #include <sys/uio.h>

diff --git a/src/key_call.c b/src/key_call.c
index 1a6430b2f51454032d090425c764816fbe12fe3a..589fd6fdb67aa37d41c287cdab1579062892097f 100644 (file)
--- a/src/key_call.c
+++ b/src/key_call.c
@@ -56,7 +56,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/wait.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 
 #include "dump.h"
 

diff --git a/src/pmap_rmt.c b/src/pmap_rmt.c
index b81d771b9f0e1a6b77233bbe1fc0a81bde001a13..1c76114bca5b35a05004d9579b1caa475e91d36f 100644 (file)
--- a/src/pmap_rmt.c
+++ b/src/pmap_rmt.c
@@ -36,7 +36,7 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 
 #include <net/if.h>

diff --git a/src/svc.c b/src/svc.c
index 8afd15d4cef1472efa45f03e55382703c8ef3519..32c84f1782ce5b3e15585faf6c08ce1473d04885 100644 (file)
--- a/src/svc.c
+++ b/src/svc.c
@@ -40,7 +40,7 @@
 
 #include <reentrant.h>
 #include <sys/types.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>

diff --git a/src/svc_vc.c b/src/svc_vc.c
index 9dba72a2a0e2cea5308bc2aa1b3bbac84f5724f6..98246312e9ffced5b7df4d33beef223f9988a3d8 100644 (file)
--- a/src/svc_vc.c
+++ b/src/svc_vc.c
@@ -40,7 +40,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/un.h>
 #include <sys/time.h>
 #include <sys/uio.h>