Merge branch 'frostbane-feature/gcc_std_thread' into develop
This commit is contained in:
commit
9b8cc1018e
@ -14,8 +14,12 @@
|
||||
#include <cstdio>
|
||||
// http://lxr.free-electrons.com/source/include/uapi/asm-generic/errno.h#L53
|
||||
//#define EPROTO 71 /* Protocol error */
|
||||
#ifdef _GLIBCXX_HAS_GTHREADS
|
||||
# include <thread>
|
||||
#else
|
||||
#include <mingw.thread.h>
|
||||
#include <mingw.mutex.h>
|
||||
#endif
|
||||
#else
|
||||
#include <boost/thread/mutex.hpp>
|
||||
#include <boost/thread/recursive_mutex.hpp>
|
||||
|
||||
@ -6,7 +6,11 @@
|
||||
|
||||
#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
|
||||
#include <boost/thread.hpp>
|
||||
namespace std
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user