Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-01-22 12:09:39 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-01-22 12:27:06 (GMT) |
| commit | 8cec645c29f8f1712eb434d2f21c78847ba49cf4 (patch) | |
| tree | e19823e5e19641e26eaf9f757276398332cabd47 | |
| parent | 1aaadc84dd9a34a5df6b9dbef867bdaa46d07a30 (diff) | |
| download | swift-contrib-8cec645c29f8f1712eb434d2f21c78847ba49cf4.zip swift-contrib-8cec645c29f8f1712eb434d2f21c78847ba49cf4.tar.bz2 | |
Revert "Another attempt at fixing the OS X hang on shutdown."
This reverts commit 5cac0d0b588b1a024ba3e6934f655d315909b656.
| -rw-r--r-- | 3rdParty/Boost/SConscript | 5 | ||||
| -rw-r--r-- | 3rdParty/Boost/src/boost/asio/detail/impl/kqueue_reactor.ipp | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript index 1883f6f..c697618 100644 --- a/3rdParty/Boost/SConscript +++ b/3rdParty/Boost/SConscript @@ -16,11 +16,10 @@ elif env.get("BOOST_BUNDLED", False) : ################################################################################ cppdefines = ["BOOST_ALL_NO_LIB", "BOOST_SYSTEM_NO_DEPRECATED"] - # Workaround for hang on exit on OS X - #if env["PLATFORM"] == "darwin" : - # cppdefines += ["BOOST_ASIO_DISABLE_KQUEUE"] if env["PLATFORM"] == "win32" : cppflags = ["/I" + Dir("src").abspath] + elif env["PLATFORM"] == "darwin" : + cppdefines += ["BOOST_ASIO_DISABLE_KQUEUE"] else : cppflags = [("-isystem", Dir("src").abspath)] diff --git a/3rdParty/Boost/src/boost/asio/detail/impl/kqueue_reactor.ipp b/3rdParty/Boost/src/boost/asio/detail/impl/kqueue_reactor.ipp index b6b692d..08209bd 100644 --- a/3rdParty/Boost/src/boost/asio/detail/impl/kqueue_reactor.ipp +++ b/3rdParty/Boost/src/boost/asio/detail/impl/kqueue_reactor.ipp @@ -55,10 +55,6 @@ kqueue_reactor::kqueue_reactor(boost::asio::io_service& io_service) kqueue_reactor::~kqueue_reactor() { - struct kevent event; - BOOST_ASIO_KQUEUE_EV_SET(&event, interrupter_.read_descriptor(), - EVFILT_READ, EV_DELETE, 0, 0, &interrupter_); - ::kevent(kqueue_fd_, &event, 1, 0, 0, 0); close(kqueue_fd_); } |