Do not define pthread_* in lightweight_thread.hpp; mingw-w64 includes pthread.h in the standard library headers

include/boost/detail/lightweight_thread.hpp

@@ -10,30 +10,59 @@
 //  boost/detail/lightweight_thread.hpp
 //
 //  Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
-//  Copyright (c) 2008 Peter Dimov
+//  Copyright (c) 2008, 2018 Peter Dimov
 //
 //  Distributed under the Boost Software License, Version 1.0.
 //  See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt
+//
+//
+//  typedef /*...*/ lw_thread_t; // as pthread_t
+//  template<class F> int lw_thread_create( lw_thread_t & th, F f );
+//  void lw_thread_join( lw_thread_t th );
+
 
 #include <boost/config.hpp>
 #include <memory>
 #include <cerrno>
 
-// pthread_create, pthread_join
-
 #if defined( BOOST_HAS_PTHREADS )
 
 #include <pthread.h>
 
-#else
+namespace boost
+{
+namespace detail
+{
+
+typedef ::pthread_t lw_thread_t;
+
+inline int lw_thread_create_( lw_thread_t* thread, const pthread_attr_t* attr, void* (*start_routine)( void* ), void* arg )
+{
+    return ::pthread_create( thread, attr, start_routine, arg );
+}
+
+inline void lw_thread_join( lw_thread_t th )
+{
+    ::pthread_join( th, 0 );
+}
+
+} // namespace detail
+} // namespace boost
+
+#else // defined( BOOST_HAS_PTHREADS )
 
 #include <windows.h>
 #include <process.h>
 
-typedef HANDLE pthread_t;
+namespace boost
+{
+namespace detail
+{
 
-int pthread_create( pthread_t * thread, void const *, unsigned (__stdcall * start_routine) (void*), void* arg )
+typedef HANDLE lw_thread_t;
+
+inline int lw_thread_create_( lw_thread_t * thread, void const *, unsigned (__stdcall * start_routine) (void*), void* arg )
 {
     HANDLE h = (HANDLE)_beginthreadex( 0, 0, start_routine, arg, 0, 0 );
 
@@ -48,20 +77,20 @@ int pthread_create( pthread_t * thread, void const *, unsigned (__stdcall * star
     }
 }
 
-int pthread_join( pthread_t thread, void ** /*value_ptr*/ )
+inline void lw_thread_join( lw_thread_t thread )
 {
     ::WaitForSingleObject( thread, INFINITE );
     ::CloseHandle( thread );
-    return 0;
 }
 
-#endif
+} // namespace detail
+} // namespace boost
+
+#endif // defined( BOOST_HAS_PTHREADS )
 
-// template<class F> int lw_thread_create( pthread_t & pt, F f );
 
 namespace boost
 {
-
 namespace detail
 {
 
@@ -131,7 +160,7 @@ private:
     F f_;
 };
 
-template<class F> int lw_thread_create( pthread_t & pt, F f )
+template<class F> int lw_thread_create( lw_thread_t & th, F f )
 {
 #if defined(BOOST_NO_CXX11_SMART_PTR)
 
@@ -143,7 +172,7 @@ template<class F> int lw_thread_create( pthread_t & pt, F f )
 
 #endif
 
-    int r = pthread_create( &pt, 0, lw_thread_routine, p.get() );
+    int r = lw_thread_create_( &th, 0, lw_thread_routine, p.get() );
 
     if( r == 0 )
     {