Skip to content

Commit

Permalink
poll: changed to include <poll.h> instead of <sys/poll.h>
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
morfoh authored and borkmann committed Apr 10, 2014
1 parent dcaf7e3 commit 049160c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion curvetun_client.c
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion curvetun_server.c
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion ring.h
Expand Up @@ -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"
Expand Down

0 comments on commit 049160c

Please sign in to comment.