From ab4d799807bdcf6ecb74c6c0ffd655d6a1a965ad Mon Sep 17 00:00:00 2001 From: alzarei Date: Mon, 16 Feb 2015 14:41:28 -0800 Subject: DRILL-1219. C++ Client. Fix timeout for 32-bit windows platform --- contrib/native/client/src/include/drill/common.hpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'contrib/native/client/src/include') diff --git a/contrib/native/client/src/include/drill/common.hpp b/contrib/native/client/src/include/drill/common.hpp index 824d67062..e149ed11d 100644 --- a/contrib/native/client/src/include/drill/common.hpp +++ b/contrib/native/client/src/include/drill/common.hpp @@ -50,6 +50,14 @@ #define CODER_DEBUGGING #endif +// http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/basic_stream_socket/cancel/overload1.html +// : "Calls to cancel() will always fail with boost::asio::error::operation_not_supported when run on Windows XP, Windows Server 2003, and earlier versions of Windows..." +// As such, achieving cancel needs to be implemented differently; +#if defined(_WIN32) && !defined(_WIN64) +#define WIN32_SHUTDOWN_ON_TIMEOUT +#endif // _WIN32 && !_WIN64 + + namespace Drill { typedef std::vector DataBuf; -- cgit v1.2.3