Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-01-20 21:15:24 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-01-20 21:15:24 (GMT) |
| commit | 768c2b7503bd6e9c9f832454a18e600998de7999 (patch) | |
| tree | 0a13b9fdd9239a6054de58c56b0c809491129d07 /3rdParty/Boost | |
| parent | 9a87658c432409366f51bdc6b33625b9890fc100 (diff) | |
| download | swift-contrib-768c2b7503bd6e9c9f832454a18e600998de7999.zip swift-contrib-768c2b7503bd6e9c9f832454a18e600998de7999.tar.bz2 | |
Revert "Temporary workaround to make boost::asio use socket_select_interrupter on OS X."
This reverts commit 9a87658c432409366f51bdc6b33625b9890fc100.
Diffstat (limited to '3rdParty/Boost')
3 files changed, 4 insertions, 4 deletions
diff --git a/3rdParty/Boost/src/boost/asio/detail/impl/socket_select_interrupter.ipp b/3rdParty/Boost/src/boost/asio/detail/impl/socket_select_interrupter.ipp index b75ae48..d697a6e 100644 --- a/3rdParty/Boost/src/boost/asio/detail/impl/socket_select_interrupter.ipp +++ b/3rdParty/Boost/src/boost/asio/detail/impl/socket_select_interrupter.ipp @@ -17,7 +17,7 @@ #include <boost/asio/detail/config.hpp> -#if defined(__APPLE__) || defined(BOOST_WINDOWS) \ +#if defined(BOOST_WINDOWS) \ || defined(__CYGWIN__) \ || defined(__SYMBIAN32__) diff --git a/3rdParty/Boost/src/boost/asio/detail/select_interrupter.hpp b/3rdParty/Boost/src/boost/asio/detail/select_interrupter.hpp index 3506430..9683e63 100644 --- a/3rdParty/Boost/src/boost/asio/detail/select_interrupter.hpp +++ b/3rdParty/Boost/src/boost/asio/detail/select_interrupter.hpp @@ -17,7 +17,7 @@ #include <boost/asio/detail/config.hpp> -#if defined(__APPLE__) || defined(BOOST_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) +#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) # include <boost/asio/detail/socket_select_interrupter.hpp> #elif defined(BOOST_ASIO_HAS_EVENTFD) # include <boost/asio/detail/eventfd_select_interrupter.hpp> @@ -29,7 +29,7 @@ namespace boost { namespace asio { namespace detail { -#if defined(__APPLE__) || defined(BOOST_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) +#if defined(BOOST_WINDOWS) || defined(__CYGWIN__) || defined(__SYMBIAN32__) typedef socket_select_interrupter select_interrupter; #elif defined(BOOST_ASIO_HAS_EVENTFD) typedef eventfd_select_interrupter select_interrupter; diff --git a/3rdParty/Boost/src/boost/asio/detail/socket_select_interrupter.hpp b/3rdParty/Boost/src/boost/asio/detail/socket_select_interrupter.hpp index 6e9e082..b674514 100644 --- a/3rdParty/Boost/src/boost/asio/detail/socket_select_interrupter.hpp +++ b/3rdParty/Boost/src/boost/asio/detail/socket_select_interrupter.hpp @@ -17,7 +17,7 @@ #include <boost/asio/detail/config.hpp> -#if defined(__APPLE__) || defined(BOOST_WINDOWS) \ +#if defined(BOOST_WINDOWS) \ || defined(__CYGWIN__) \ || defined(__SYMBIAN32__) |