libbb: use <poll.h> instead of <sys/poll.h>

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/include/libbb.h b/include/libbb.h
index c965461097253cabe50654ae240ae0e700491511..58271655dddaf1484ffde533476e100fb4b6f721 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -32,12 +32,12 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <string.h>
-/* There are two incompatible basename's, let not use them! */
+/* There are two incompatible basename's, let's not use them! */
 /* See the dirname/basename man page for details */
 #include <libgen.h> /* dirname,basename */
 #undef basename
 #define basename dont_use_basename
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/socket.h>

diff --git a/runit/runsv.c b/runit/runsv.c
index 3e1a3c8e5e6265eb35a5688bb43984f3ef86ada8..d941e897d0baf7917c3a8c084e16211f4590201f 100644 (file)
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -33,7 +33,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //usage:#define runsv_full_usage "\n\n"
 //usage:       "Start and monitor a service and optionally an appendant log service"
 
-#include <sys/poll.h>
 #include <sys/file.h>
 #include "libbb.h"
 #include "runit_lib.h"

diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 32526cf4caecb8558fc1186d3638cbda42ada5f5..af7e75ba761fb813a386485e6522d7b6b53e7c41 100644 (file)
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -35,7 +35,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //usage:     "\n       -P              Put each runsv in a new session"
 //usage:     "\n       -s SCRIPT       Run SCRIPT <signo> after signal is processed"
 
-#include <sys/poll.h>
 #include <sys/file.h>
 #include "libbb.h"
 #include "runit_lib.h"

diff --git a/runit/sv.c b/runit/sv.c
index 5b01c875c1ae1215db9add5635a2f5801979c0af..825e9d45bbf8e4cec1c696cd17edc71eb5863db5 100644 (file)
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -169,7 +169,6 @@ Exit Codes
 //usage:       "pause, cont, hup, alarm, interrupt, quit, 1, 2, term, kill: send\n"
 //usage:       "STOP, CONT, HUP, ALRM, INT, QUIT, USR1, USR2, TERM, KILL signal to service"
 
-#include <sys/poll.h>
 #include <sys/file.h>
 #include "libbb.h"
 #include "runit_lib.h"

diff --git a/runit/svlogd.c b/runit/svlogd.c
index 8b8a6d858325cd399c4d1357bcc0917e7492ac20..c080b9acc703a7053c3fae5ac162327e3935f37b 100644 (file)
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -142,7 +142,6 @@ log message, you can use a pattern like this instead
 //usage:   "\n""+,-PATTERN - (de)select line for logging"
 //usage:   "\n""E,ePATTERN - (de)select line for stderr"
 
-#include <sys/poll.h>
 #include <sys/file.h>
 #include "libbb.h"
 #include "runit_lib.h"