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 aaf53b93c729fe28a2a6e2622085598157c8ef4d..3a38f733ab781b62874b00f19cdc20be96824f9e 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 1ce8776d8a0766ae2721e9c97a6b7f3419c3c1cb..ad8ad659d2db36c2e10fc88e355c3bc196da5217 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 8cc4412034751e73ff6307df81f51c0a9ba86fff..e07761aeb937cc261cbee9f5bc8ec10ae18682c1 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 bd02ee12b37754b5fb47fbd174de75d8879d0605..2a3de709580c876b398de42ef32b3e2d82648ca3 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 6fb83033d9e84fdf96ae07a5faea5f2e8806c712..434a989bfcc814790c2a4037dc89b4e4f957b4cf 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 4b07747e1ed71af9c7d5138eb44cbbf227e9c2aa..421487e03869e81607a6480601bf84c020cb3b75 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 340b8000d4f224667a96863f5f9bfc2891955e0b..2c23db0901e59629d00f473a5e8aba8acb6bd1e2 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 5fba0043e4510119652867c83a79cb02064758d3..4775219e4a514649164063f1f145d3883d998354 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 514b6491ceead8301c679d8e22b3085add7fcad3..ee8e607c27bf30f300883ebfa25f7973184c1569 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 d7cd4ba29f0cc29610d7a321d225f62cabbc1796..7a6a383b32560509704f421e340d29fbf6b9b754 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 ecf47fda3d36481d5426eb3c323fd5674a36b6e8..94891cdf35b16b6aad570e2150fa81fb2c7a4643 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 d3eb834810819d3ed3867a7bcc6068ee1130e108..52883fa8cde2d7ee34a1a7a83c0f19ac8af3eb3b 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 1bf77e46fb9da9c3861d15f009b86c6a5aec48fd..cac9b656015d1b3db1789f21f126483ece174149 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 c171405a65b0a3f6266021c8e79046ec46a3d8da..f71749f72d4d136c15a480cf218764986551abf4 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 28f88a15703db6c828520ed933f6552b3ba463a9..2802e8246d4b51a57343188fa1afbac00fba9e94 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 c735cac3b1209ee59b6560e9ab715d4023e6c547..c4713feb5d97f3ac47df14baa5e7136e0d7e9e61 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 fea695fcf945e0d9f5a495d7f9104cb124465c73..6448280c4f84cc7e839fd9495cdafab50700539b 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 08ddde8fd77f19ab460709b098a69635f9f156f8..3f1fee7f7eb0c03c1a7587deb462b6f0556caabc 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 54683b6f4af25c3bd47fd1499f18bfb9a95c3894..abf5f525dd9c0e603f21ecba7cff470b3c10be31 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 890cc0494168434c3055414b02bc43abe5f28058..b5ad70161194edeca27cbdc9e9570bd782e25020 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 d6589a67f695c7db2aed8fc38d38115f47bf06ba..0a61dafc59026631532478607488e3736fcd80a1 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 45741f9e9da1dcad1e9cb7794c1caa02679c8fbd..c2495056d77005f809557b0e6d7cf9949d9ce7f1 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 006ad532ba94290048cbc9a6b1766b04abef9175..8f259a8f39c5254a3fb3fc61bbd679bf79bd9bbf 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 f5fcebebe7a1c26028593ebd93446e5eefb2d4ad..3a633512473d7d7c93d0574ed9b27064490f7a3f 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 31f13ec808c0c5567ac421b4fb3ada62cf812ede..bdb962af3497d9a901450b85be009dd4386dcfca 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 826efbfeabb12a139508fa35d5c5dd47829e579a..701882b96d58da442077c825babb3d63e1c031ad 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 bdf651246bd0dad742e017a6c157cea0b1e45a74..47093b850dcf4f319a3634748dd9fb0e3e5949f8 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 538b34286561065bdf6a55d7e0676b74e67fa68e..7b5ef6b2a8e6fbfcd71659722cc8aeeeb6ac6a4b 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 a8dd462d6ddaf5b97dcc7a75e763369ffb815f56..bc115f112d7c56c01ab59b7e11f25f353d400bc8 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 6bcb3a985e99bb99235198bdfaccd0e36cf28e0e..fff5de7a8b42679f2f0084f63e419486c83c1597 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 b2a7376292c311113f1cd8c199788e611921681c..baaeca935275d9273993bdf6b31515baaab9fd26 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 009e2fed754992c622a6fb3d9bdf38569b34f406..99d4c8983a5564bef80b3da0cb3e80e760047b35 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>