From fc61ce53bf9e7a099b6356dd88122f60f9a21eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
Date: Thu, 26 Sep 2019 15:29:19 -0400
Subject: rpcbind: Correct some of includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Musl based systems are more pedantic than glibc ones about where we
include files from. Correct some headers to include proper files.

In file included from src/rpcb_svc_com.c:45:0:
/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
 #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
  ^~~~~~~

In file included from src/rpcbind.c:45:0:
/usr/include/sys/errno.h:1:2: warning: #warning redirecting incorrect #include <sys/errno.h> to <errno.h> [-Wcpp]
 #warning redirecting incorrect #include <sys/errno.h> to <errno.h>
  ^~~~~~~
In file included from src/rpcbind.c:49:0:
/usr/include/sys/signal.h:1:2: warning: #warning redirecting incorrect #include <sys/signal.h> to <signal.h> [-Wcpp]
 #warning redirecting incorrect #include <sys/signal.h> to <signal.h>
  ^~~~~~~

In file included from src/util.c:48:0:
/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
 #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
  ^~~~~~~

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
Signed-off-by: Steve Dickson <steved@redhat.com>
---
 src/rpcb_svc_com.c | 2 +-
 src/rpcbind.c      | 3 +--
 src/util.c         | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
index 9c1c3af..1743dad 100644
--- a/src/rpcb_svc_com.c
+++ b/src/rpcb_svc_com.c
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <bits/poll.h>
 #include <sys/socket.h>
 #include <rpc/rpc.h>
diff --git a/src/rpcbind.c b/src/rpcbind.c
index cc848b1..e39f4a1 100644
--- a/src/rpcbind.c
+++ b/src/rpcbind.c
@@ -42,11 +42,10 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/errno.h>
 #include <sys/resource.h>
 #include <sys/wait.h>
 #include <sys/time.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/src/util.c b/src/util.c
index bf2d024..5d0283e 100644
--- a/src/util.c
+++ b/src/util.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>
 #include <errno.h>
 #include <stdlib.h>
-- 
cgit v1.2.1