50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 40192301130dcd913aa6d9cb9dba9e5f8dbd9d16 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 1/4] use POSIX poll.h instead of 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 warning 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>
|
|
---
|
|
Upstream-Status: Submitted https://svn.boost.org/trac/boost/ticket/12419
|
|
boost/asio/detail/socket_types.hpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/boost/asio/detail/socket_types.hpp b/boost/asio/detail/socket_types.hpp
|
|
index e8c7109..7e65d3c 100644
|
|
--- a/boost/asio/detail/socket_types.hpp
|
|
+++ b/boost/asio/detail/socket_types.hpp
|
|
@@ -58,7 +58,7 @@
|
|
#else
|
|
# include <sys/ioctl.h>
|
|
# if !defined(__SYMBIAN32__)
|
|
-# include <sys/poll.h>
|
|
+# include <poll.h>
|
|
# endif
|
|
# include <sys/types.h>
|
|
# include <sys/stat.h>
|
|
--
|
|
2.9.3
|
|
|