include <poll.h> instead of <sys/poll.h>

include-what-you-use automatically does this and it makes finding
unnecessary harder to spot. The only content of poll.h is a include
of sys/poll.h so should be harmless.

diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml
index aaf53b9..3a38f73 100644 (file)
--- a/man/sd_journal_get_fd.xml
+++ b/man/sd_journal_get_fd.xml
@@ -291,7 +291,7 @@ int main(int argc, char *argv[]) {
     example lacks all error checking for the sake of
     simplicity):</para>
 
-    <programlisting>#include &lt;sys/poll.h&gt;
+    <programlisting>#include &lt;poll.h&gt;
 #include &lt;systemd/sd-journal.h&gt;
 
 int wait_for_changes(sd_journal *j) {

diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index 1ce8776..ad8ad65 100644 (file)
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -20,7 +20,7 @@
 ***/
 
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <string.h>

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 8cc4412..e07761a 100644 (file)
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/prctl.h>
 #include <stddef.h>
 #include <getopt.h>

diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
index bd02ee1..2a3de70 100644 (file)
--- a/src/bus-proxyd/proxy.c
+++ b/src/bus-proxyd/proxy.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <stddef.h>
 #include <getopt.h>
 

diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c
index 6fb8303..434a989 100644 (file)
--- a/src/bus-proxyd/stdio-bridge.c
+++ b/src/bus-proxyd/stdio-bridge.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <stddef.h>
 #include <getopt.h>
 

diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/bus-proxyd/test-bus-xml-policy.c
index 4b07747..421487e 100644 (file)
--- a/src/bus-proxyd/test-bus-xml-policy.c
+++ b/src/bus-proxyd/test-bus-xml-policy.c
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <stddef.h>
 #include <getopt.h>
 

diff --git a/src/core/execute.c b/src/core/execute.c
index 340b800..2c23db0 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -37,7 +37,7 @@
 #include <sys/mount.h>
 #include <linux/fs.h>
 #include <linux/oom.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <glob.h>
 #include <sys/personality.h>
 

diff --git a/src/core/manager.c b/src/core/manager.c
index 5fba004..4775219 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/inotify.h>
 #include <sys/epoll.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/reboot.h>
 #include <sys/ioctl.h>
 #include <linux/kd.h>

diff --git a/src/core/unit.c b/src/core/unit.c
index 514b649..ee8e607 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index d7cd4ba..7a6a383 100644 (file)
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/epoll.h>
 #include <sys/un.h>
 #include <fcntl.h>

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index ecf47fd..94891cd 100644 (file)
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -24,7 +24,7 @@
 #include <stddef.h>
 #include <unistd.h>
 #include <sys/inotify.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/vfs.h>
 #include <linux/magic.h>
 

diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index d3eb834..52883fa 100644 (file)
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -23,7 +23,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <byteswap.h>
 
 #include "util.h"

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 1bf77e4..cac9b65 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <netdb.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <byteswap.h>
 #include <sys/mman.h>
 #include <pthread.h>

diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index c171405..f71749f 100644 (file)
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/inotify.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include "util.h"
 #include "cgroup-util.h"

diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c
index 28f88a1..2802e82 100644 (file)
--- a/src/libsystemd/sd-login/test-login.c
+++ b/src/libsystemd/sd-login/test-login.c
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/poll.h>
+#include <poll.h>
 #include <string.h>
 
 #include "systemd/sd-login.h"

diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index c735cac..c4713fe 100644 (file)
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/inotify.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <net/if.h>
 
 #include "util.h"

diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index fea695f..6448280 100644 (file)
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -40,7 +40,7 @@
 #include <stdint.h>
 #include <pthread.h>
 #include <sys/prctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include "util.h"
 #include "list.h"

diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 08ddde8..3f1fee7 100644 (file)
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <string.h>
 #include <dirent.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>

diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index 54683b6..abf5f52 100644 (file)
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -20,7 +20,7 @@
 ***/
 
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <string.h>

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 890cc04..b5ad701 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -23,7 +23,7 @@
 #include <resolv.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <netinet/in.h>
 
 #include "rtnl-util.h"

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index d6589a6..0a61daf 100644 (file)
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <termios.h>
 #include <unistd.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/inotify.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 45741f9..c249505 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <assert.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 #include <string.h>
 #include <fcntl.h>

diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index 006ad53..8f259a8 100644 (file)
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -27,7 +27,7 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include "log.h"
 #include "util.h"

diff --git a/src/shared/util.c b/src/shared/util.c
index f5fcebe..3a63351 100644 (file)
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -39,7 +39,7 @@
 #include <linux/tiocl.h>
 #include <termios.h>
 #include <stdarg.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <ctype.h>
 #include <sys/prctl.h>
 #include <sys/utsname.h>

diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 31f13ec..bdb962a 100644 (file)
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -26,7 +26,7 @@
 #include <sys/utsname.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include "macro.h"
 #include "path-util.h"

diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
index 826efbf..701882b 100644 (file)
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -20,7 +20,7 @@
 ***/
 
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/types.h>
 #include <sys/timerfd.h>
 #include <assert.h>

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index bdf6512..47093b8 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <stddef.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/inotify.h>
 #include <unistd.h>
 #include <getopt.h>

diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 538b342..7b5ef6b 100644 (file)
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index a8dd462..bc115f1 100644 (file)
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -26,7 +26,7 @@
 #include <time.h>
 #include <net/if.h>
 #include <sys/prctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/epoll.h>
 #include <sys/wait.h>
 #include <sys/signalfd.h>

diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 6bcb3a9..fff5de7 100644 (file)
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -28,7 +28,7 @@
 #include <getopt.h>
 #include <signal.h>
 #include <time.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 

diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c
index b2a7376..baaeca9 100644 (file)
--- a/src/udev/udevadm-test-builtin.c
+++ b/src/udev/udevadm-test-builtin.c
@@ -27,7 +27,7 @@
 #include <signal.h>
 #include <time.h>
 #include <sys/inotify.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 009e2fe..99d4c89 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -39,7 +39,7 @@
 #include <sys/signalfd.h>
 #include <sys/epoll.h>
 #include <sys/mount.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>