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

Merge branch 'frostbane-feature/gcc_std_thread' into develop

Browse Source
This commit is contained in:
Jinhao 2017-10-04 19:22:22 +08:00
commit 9b8cc1018e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nana/std_mutex.hpp
View File

@ -14,8 +14,12 @@
#include <cstdio> #include <cstdio>
// http://lxr.free-electrons.com/source/include/uapi/asm-generic/errno.h#L53 // http://lxr.free-electrons.com/source/include/uapi/asm-generic/errno.h#L53
//#define EPROTO 71 /* Protocol error */ //#define EPROTO 71 /* Protocol error */
#ifdef _GLIBCXX_HAS_GTHREADS
# include <thread>
#else
#include <mingw.thread.h> #include <mingw.thread.h>
#include <mingw.mutex.h> #include <mingw.mutex.h>
#endif
#else #else
#include <boost/thread/mutex.hpp> #include <boost/thread/mutex.hpp>
#include <boost/thread/recursive_mutex.hpp> #include <boost/thread/recursive_mutex.hpp>

6
include/nana/std_thread.hpp
View File

@ -6,7 +6,11 @@
#if defined(NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ) #if defined(NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
#include <mingw.thread.h> #ifdef _GLIBCXX_HAS_GTHREADS
# include <thread>
#else
# include <mingw.thread.h>
#endif
#else #else
#include <boost/thread.hpp> #include <boost/thread.hpp>
namespace std namespace std