summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Wiese <chris@opensde.org>2014-04-10 15:01:56 +0200
committerDaniel Borkmann <dborkman@redhat.com>2014-04-10 17:40:05 +0200
commit049160cce62d02bd3b3f501368fc21eb2ca66dfa (patch)
treee7585da660f768a943d0a3282a46565e74c712ad
parentdcaf7e37a0a47bb83c0470aa9b5e0c1bcb521dcf (diff)
poll: changed to include <poll.h> instead of <sys/poll.h>
This is a very cosmetic change but I think it is good to be standards compliant. The standard defines <poll.h> and not <sys/poll.h>: http://pubs.opengroup.org/onlinepubs/009696799/basedefs/poll.h.html When building against musl libc it silences some annoying cpp warnings like this: ----------------------------------------------------------------------- warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp] ----------------------------------------------------------------------- Signed-off-by: Christian Wiese <chris@opensde.org> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
-rw-r--r--curvetun_client.c2
-rw-r--r--curvetun_server.c2
-rw-r--r--ring.h1
3 files changed, 2 insertions, 3 deletions
diff --git a/curvetun_client.c b/curvetun_client.c
index 19fe94c..0b96e75 100644
--- a/curvetun_client.c
+++ b/curvetun_client.c
@@ -20,7 +20,7 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
#include <linux/if_tun.h>
diff --git a/curvetun_server.c b/curvetun_server.c
index 097295b..36a55fe 100644
--- a/curvetun_server.c
+++ b/curvetun_server.c
@@ -20,7 +20,7 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
diff --git a/ring.h b/ring.h
index 55d5e96..9522410 100644
--- a/ring.h
+++ b/ring.h
@@ -20,7 +20,6 @@
#include <sys/ioctl.h>
#include <string.h>
#include <poll.h>
-#include <sys/poll.h>
#include "built_in.h"
#include "die.h"