1 files changed, 80 insertions, 50 deletions

diff --git a/boost/detail/winapi/thread_pool.hpp b/boost/detail/winapi/thread_pool.hpp
index 57059dc1b2..f81c545961 100644
--- a/boost/detail/winapi/thread_pool.hpp
+++ b/boost/detail/winapi/thread_pool.hpp
@@ -9,7 +9,7 @@
 #ifndef BOOST_DETAIL_WINAPI_THREAD_POOL_HPP
 #define BOOST_DETAIL_WINAPI_THREAD_POOL_HPP
 
-#include <boost/detail/winapi/basic_types.hpp>
+#include <boost/detail/winapi/config.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -17,13 +17,41 @@
 
 #if BOOST_USE_WINAPI_VERSION >= BOOST_WINAPI_VERSION_WIN2K
 
-namespace boost
-{
-namespace detail
-{
-namespace winapi
-{
-#if defined( BOOST_USE_WINDOWS_H )
+#include <boost/detail/winapi/basic_types.hpp>
+
+#if !defined( BOOST_USE_WINDOWS_H )
+extern "C" {
+typedef boost::detail::winapi::VOID_ (NTAPI *WAITORTIMERCALLBACKFUNC)
+(boost::detail::winapi::PVOID_, boost::detail::winapi::BOOLEAN_);
+typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK;
+
+BOOST_SYMBOL_IMPORT boost::detail::winapi::BOOL_ WINAPI
+RegisterWaitForSingleObject(
+    boost::detail::winapi::PHANDLE_ phNewWaitObject,
+    boost::detail::winapi::HANDLE_ hObject,
+    WAITORTIMERCALLBACK Callback,
+    boost::detail::winapi::PVOID_ Context,
+    boost::detail::winapi::ULONG_ dwMilliseconds,
+    boost::detail::winapi::ULONG_ dwFlags);
+}
+#endif
+
+// MinGW is buggy - it is missing these function declarations for Win2000
+#if !defined( BOOST_USE_WINDOWS_H ) || (defined(BOOST_WINAPI_IS_MINGW) && BOOST_USE_WINAPI_VERSION < BOOST_WINAPI_VERSION_WINXP)
+extern "C" {
+BOOST_SYMBOL_IMPORT boost::detail::winapi::BOOL_ WINAPI
+UnregisterWait(boost::detail::winapi::HANDLE_ WaitHandle);
+
+BOOST_SYMBOL_IMPORT boost::detail::winapi::BOOL_ WINAPI
+UnregisterWaitEx(
+    boost::detail::winapi::HANDLE_ WaitHandle,
+    boost::detail::winapi::HANDLE_ CompletionEvent);
+}
+#endif
+
+namespace boost {
+namespace detail {
+namespace winapi {
 
 typedef ::WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACKFUNC_;
 typedef ::WAITORTIMERCALLBACK WAITORTIMERCALLBACK_;
@@ -32,61 +60,63 @@ using ::RegisterWaitForSingleObject;
 using ::UnregisterWait;
 using ::UnregisterWaitEx;
 
-const ULONG_ wt_execute_default = WT_EXECUTEDEFAULT;
-const ULONG_ wt_execute_in_io_thread = WT_EXECUTEINIOTHREAD;
-const ULONG_ wt_execute_in_ui_thread = WT_EXECUTEINUITHREAD;
-const ULONG_ wt_execute_in_wait_thread = WT_EXECUTEINWAITTHREAD;
-const ULONG_ wt_execute_only_once = WT_EXECUTEONLYONCE;
-const ULONG_ wt_execute_in_timer_thread = WT_EXECUTEINTIMERTHREAD;
-const ULONG_ wt_execute_long_function = WT_EXECUTELONGFUNCTION;
-const ULONG_ wt_execute_in_persistent_io_thread = WT_EXECUTEINPERSISTENTIOTHREAD;
-const ULONG_ wt_execute_in_persistent_thread = WT_EXECUTEINPERSISTENTTHREAD;
-const ULONG_ wt_transfer_impersonation = WT_TRANSFER_IMPERSONATION;
+#if defined( BOOST_USE_WINDOWS_H )
+
+const ULONG_ WT_EXECUTEDEFAULT_ = WT_EXECUTEDEFAULT;
+const ULONG_ WT_EXECUTEINIOTHREAD_ = WT_EXECUTEINIOTHREAD;
+#if defined( BOOST_WINAPI_IS_MINGW )
+const ULONG_ WT_EXECUTEINUITHREAD_ = 0x00000002;
+#else
+const ULONG_ WT_EXECUTEINUITHREAD_ = WT_EXECUTEINUITHREAD;
+#endif
+const ULONG_ WT_EXECUTEINWAITTHREAD_ = WT_EXECUTEINWAITTHREAD;
+const ULONG_ WT_EXECUTEONLYONCE_ = WT_EXECUTEONLYONCE;
+const ULONG_ WT_EXECUTEINTIMERTHREAD_ = WT_EXECUTEINTIMERTHREAD;
+const ULONG_ WT_EXECUTELONGFUNCTION_ = WT_EXECUTELONGFUNCTION;
+#if defined( BOOST_WINAPI_IS_MINGW )
+const ULONG_ WT_EXECUTEINPERSISTENTIOTHREAD_ = 0x00000040;
+#else
+const ULONG_ WT_EXECUTEINPERSISTENTIOTHREAD_ = WT_EXECUTEINPERSISTENTIOTHREAD;
+#endif
+const ULONG_ WT_EXECUTEINPERSISTENTTHREAD_ = WT_EXECUTEINPERSISTENTTHREAD;
+const ULONG_ WT_TRANSFER_IMPERSONATION_ = WT_TRANSFER_IMPERSONATION;
 
 inline ULONG_ wt_set_max_threadpool_threads(ULONG_ flags, ULONG_ limit)
 {
     return WT_SET_MAX_THREADPOOL_THREADS(flags, limit);
 }
 
-#else
-
-extern "C" {
+#else // defined( BOOST_USE_WINDOWS_H )
 
-typedef void (NTAPI* WAITORTIMERCALLBACKFUNC_) (PVOID_, BOOLEAN_);
-typedef WAITORTIMERCALLBACKFUNC_ WAITORTIMERCALLBACK_;
-
-__declspec(dllimport) BOOL_ WINAPI RegisterWaitForSingleObject
-(
-    HANDLE_* phNewWaitObject,
-    HANDLE_ hObject,
-    WAITORTIMERCALLBACK_ Callback,
-    PVOID_ Context,
-    ULONG_ dwMilliseconds,
-    ULONG_ dwFlags
-);
-
-__declspec(dllimport) BOOL_ WINAPI UnregisterWait(HANDLE_ WaitHandle);
-__declspec(dllimport) BOOL_ WINAPI UnregisterWaitEx(HANDLE_ WaitHandle, HANDLE_ CompletionEvent);
-
-} // extern "C"
-
-const ULONG_ wt_execute_default = 0x00000000;
-const ULONG_ wt_execute_in_io_thread = 0x00000001;
-const ULONG_ wt_execute_in_ui_thread = 0x00000002;
-const ULONG_ wt_execute_in_wait_thread = 0x00000004;
-const ULONG_ wt_execute_only_once = 0x00000008;
-const ULONG_ wt_execute_in_timer_thread = 0x00000020;
-const ULONG_ wt_execute_long_function = 0x00000010;
-const ULONG_ wt_execute_in_persistent_io_thread = 0x00000040;
-const ULONG_ wt_execute_in_persistent_thread = 0x00000080;
-const ULONG_ wt_transfer_impersonation = 0x00000100;
+const ULONG_ WT_EXECUTEDEFAULT_ = 0x00000000;
+const ULONG_ WT_EXECUTEINIOTHREAD_ = 0x00000001;
+const ULONG_ WT_EXECUTEINUITHREAD_ = 0x00000002;
+const ULONG_ WT_EXECUTEINWAITTHREAD_ = 0x00000004;
+const ULONG_ WT_EXECUTEONLYONCE_ = 0x00000008;
+const ULONG_ WT_EXECUTEINTIMERTHREAD_ = 0x00000020;
+const ULONG_ WT_EXECUTELONGFUNCTION_ = 0x00000010;
+const ULONG_ WT_EXECUTEINPERSISTENTIOTHREAD_ = 0x00000040;
+const ULONG_ WT_EXECUTEINPERSISTENTTHREAD_ = 0x00000080;
+const ULONG_ WT_TRANSFER_IMPERSONATION_ = 0x00000100;
 
 inline ULONG_ wt_set_max_threadpool_threads(ULONG_ flags, ULONG_ limit)
 {
     return flags | (limit << 16);
 }
 
-#endif
+#endif // defined( BOOST_USE_WINDOWS_H )
+
+const ULONG_ wt_execute_default = WT_EXECUTEDEFAULT_;
+const ULONG_ wt_execute_in_io_thread = WT_EXECUTEINIOTHREAD_;
+const ULONG_ wt_execute_in_ui_thread = WT_EXECUTEINUITHREAD_;
+const ULONG_ wt_execute_in_wait_thread = WT_EXECUTEINWAITTHREAD_;
+const ULONG_ wt_execute_only_once = WT_EXECUTEONLYONCE_;
+const ULONG_ wt_execute_in_timer_thread = WT_EXECUTEINTIMERTHREAD_;
+const ULONG_ wt_execute_long_function = WT_EXECUTELONGFUNCTION_;
+const ULONG_ wt_execute_in_persistent_io_thread = WT_EXECUTEINPERSISTENTIOTHREAD_;
+const ULONG_ wt_execute_in_persistent_thread = WT_EXECUTEINPERSISTENTTHREAD_;
+const ULONG_ wt_transfer_impersonation = WT_TRANSFER_IMPERSONATION_;
+
 }
 }
 }