From 2fdddb46c266a40348d8518a0a458fbfe9103779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com>
Date: Wed, 24 Aug 2016 21:01:43 +0100
Subject: [PATCH] use POSIX poll.h instead of glibc-specific sys/poll.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
POSIX specifies that <poll.h> is the correct header to
include for poll()
http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html
whereas <sys/poll.h> is only needed for ancient glibc (<2.3),
so let's follow POSIX instead.
As a side-effect, this silences a warnings when compiling
against the musl C-library:
In file included from ./boost/asio/detail/socket_types.hpp:61:0,
from ./boost/asio/ip/address_v4.hpp:21,
from ./boost/asio/ip/address.hpp:21,
from libs/log/src/init_from_settings.cpp:65:
<sysroot>/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
#warning redirecting incorrect #include <sys/poll.h> to <poll.h>
^~~~~~~
etc.
Signed-off-by: André Draszik <adraszik@tycoint.com>
---
include/boost/asio/detail/socket_types.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/boost/asio/detail/socket_types.hpp b/include/boost/asio/detail/socket_types.hpp
index e8c7109..7e65d3c 100644
|
a
|
b
|
|
| 58 | 58 | #else |
| 59 | 59 | # include <sys/ioctl.h> |
| 60 | 60 | # if !defined(__SYMBIAN32__) |
| 61 | | # include <sys/poll.h> |
| | 61 | # include <poll.h> |
| 62 | 62 | # endif |
| 63 | 63 | # include <sys/types.h> |
| 64 | 64 | # include <sys/stat.h> |
