mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dnso86-patch-1' into hotfix-1.5.6

Browse Source
This commit is contained in:
Jinhao 2018-02-17 04:04:55 +08:00
commit daf57bbd19
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/nana/c++defines.hpp
View File

@ -171,9 +171,9 @@
#endif #endif
#endif #endif
//Assume the std::thread is not implement on MinGW //Assume the std::thread is not implemented on MinGW,
//unless it was compiled with POSIX threading support.
//But some toolchains may implement std::thread. //But some toolchains may implement std::thread.
// it seems that MinGW 6.3 and 7.1 have std::thread
#ifdef NANA_MINGW #ifdef NANA_MINGW
# ifndef STD_THREAD_NOT_SUPPORTED # ifndef STD_THREAD_NOT_SUPPORTED
# define STD_THREAD_NOT_SUPPORTED # define STD_THREAD_NOT_SUPPORTED
@ -222,8 +222,11 @@
# undef STD_FILESYSTEM_NOT_SUPPORTED # undef STD_FILESYSTEM_NOT_SUPPORTED
# endif # endif
# if __has_include(<mutex>) # if __has_include(<mutex>)
# if !(defined(NANA_MINGW) && !defined(_GLIBCXX_HAS_GTHREADS))
//See the comment above regarding MinGW's threading support
# undef STD_THREAD_NOT_SUPPORTED # undef STD_THREAD_NOT_SUPPORTED
# endif # endif
# endif
#endif #endif
#endif // NANA_CXX_DEFINES_INCLUDED #endif // NANA_CXX_DEFINES_INCLUDED