From 57567de421aef3d2725059cf23b2e372280bb1ac Mon Sep 17 00:00:00 2001 From: John Sebastian Peterson Date: Mon, 9 Mar 2015 21:43:17 +0100 Subject: [PATCH 1/2] Fix WinRT macro --- include/boost/asio/detail/config.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/asio/detail/config.hpp b/include/boost/asio/detail/config.hpp index 453f04d7..0483e2de 100644 --- a/include/boost/asio/detail/config.hpp +++ b/include/boost/asio/detail/config.hpp @@ -456,9 +456,9 @@ #if !defined(BOOST_ASIO_WINDOWS_RUNTIME) # if defined(__cplusplus_winrt) # include -# if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP) +# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) # define BOOST_ASIO_WINDOWS_RUNTIME 1 -# endif // WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP) +# endif // WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) # endif // defined(__cplusplus_winrt) #endif // !defined(BOOST_ASIO_WINDOWS_RUNTIME) From 86e8eeb0c4ccf574a0c4239254b5de0dc4d691ab Mon Sep 17 00:00:00 2001 From: John Sebastian Peterson Date: Mon, 9 Mar 2015 21:43:57 +0100 Subject: [PATCH 2/2] Fix name conflict with winsock struct --- include/boost/asio/detail/socket_types.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/boost/asio/detail/socket_types.hpp b/include/boost/asio/detail/socket_types.hpp index 29e4739a..594985a0 100644 --- a/include/boost/asio/detail/socket_types.hpp +++ b/include/boost/asio/detail/socket_types.hpp @@ -93,6 +93,7 @@ const int max_addr_v4_str_len = 256; const int max_addr_v6_str_len = 256; typedef unsigned __int32 u_long_type; typedef unsigned __int16 u_short_type; +#undef s_addr struct in4_addr_type { u_long_type s_addr; }; struct in4_mreq_type { in4_addr_type imr_multiaddr, imr_interface; }; struct in6_addr_type { unsigned char s6_addr[16]; };