src: conditionalize / remove use of poll.h

Remove imports of poll.h which are redundant, and
conditionalize remaining usage that needs to compile
on Windows platforms.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c
index 88bcc6447249cc8eaa0767a505cf2a3bfeaa56f2..0db7bf074778c440f42ed889de692c06e13cd830 100644 (file)
--- a/src/util/virpolkit.c
+++ b/src/util/virpolkit.c
@@ -20,7 +20,6 @@
  */
 
 #include <config.h>
-#include <poll.h>
 
 #include "virpolkit.h"
 #include "virerror.h"
@@ -36,6 +35,7 @@
 VIR_LOG_INIT("util.polkit");
 
 #if WITH_POLKIT
+# include <poll.h>
 
 struct _virPolkitAgent {
     virCommandPtr cmd;

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 830f082a771bd2e80dba81f0f5228017e9f01924..fa6b56fd79f63387957f65e9cfda308d1df08186 100644 (file)
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -25,7 +25,6 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include <poll.h>
 #include <sys/stat.h>
 
 #ifdef WIN32

diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index a7a3c44e33da77819d459bf76d46f1c6f0587048..b9677f2caa6837597c50ddf7d59ed905649a464c 100644 (file)
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -23,13 +23,13 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <poll.h>
 
 #include "internal.h"
 #define NO_LIBVIRT
 #include "testutils.h"
 
 #ifndef WIN32
+# include <poll.h>
 
 /* Some UNIX lack it in headers & it doesn't hurt to redeclare */
 extern char **environ;