blob: 7f95f5a25efb5487fc932a6606a23dc910af3361 [file] [log] [blame]
Patrick Williamsddad1a12017-02-23 20:36:32 -06001From dac36a170188917e2f61b0394ba8a2f6509ddf3a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com>
3Date: Tue, 8 Nov 2016 20:39:55 +0000
4Subject: [PATCH] use POSIX poll.h instead of sys/poll.h
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9POSIX specifies that <poll.h> is the correct header to
10include for poll()
11 http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html
12whereas <sys/poll.h> is only needed for ancient glibc (<2.3),
13so let's follow POSIX instead.
14
15As a side-effect, this silences numerous compilation warnings
16when compiling against the musl C-library:
17
18In file included from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/socket_types.hpp:57:0,
19 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/impl/error_code.ipp:29,
20 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/error_code.hpp:185,
21 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/throw_error.hpp:19,
22 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/impl/posix_tss_ptr.ipp:23,
23 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/posix_tss_ptr.hpp:74,
24 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/tss_ptr.hpp:27,
25 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/call_stack.hpp:20,
26 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/impl/handler_alloc_hook.ipp:19,
27 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/handler_alloc_hook.hpp:78,
28 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/handler_alloc_helpers.hpp:21,
29 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/bind_handler.hpp:19,
30 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/detail/wrapped_handler.hpp:18,
31 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/io_service.hpp:24,
32 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/basic_io_object.hpp:19,
33 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/basic_socket.hpp:20,
34 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio/basic_datagram_socket.hpp:20,
35 from ../../../../asio-1.10.6/src/examples/cpp03/../../../include/asio.hpp:19,
36 from ../../../../asio-1.10.6/src/examples/cpp03/buffers/reference_counted.cpp:11:
37<sysroot>/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
38 #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
39 ^~~~~~~
40
41etc.
42
43Signed-off-by: André Draszik <adraszik@tycoint.com>
44---
45Upstream-Status: Submitted https://svn.boost.org/trac/boost/ticket/12419
46 include/asio/detail/socket_types.hpp | 2 +-
47 1 file changed, 1 insertion(+), 1 deletion(-)
48
49diff --git a/include/asio/detail/socket_types.hpp b/include/asio/detail/socket_types.hpp
50index f2600c2..cb61b8e 100644
51--- a/include/asio/detail/socket_types.hpp
52+++ b/include/asio/detail/socket_types.hpp
53@@ -54,7 +54,7 @@
54 #else
55 # include <sys/ioctl.h>
56 # if !defined(__SYMBIAN32__)
57-# include <sys/poll.h>
58+# include <poll.h>
59 # endif
60 # include <sys/types.h>
61 # include <sys/stat.h>
62--
632.10.2
64