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

Merge branch 'hotfix-1.3' of https://github.com/Pr0curo/nana into Pr0curo-hotfix-1.3

Browse Source
This commit is contained in:
Jinhao 2016-03-23 16:21:26 +08:00
commit 82e201d403
5 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -109,6 +109,7 @@ if(WIN32)
if(MINGW) if(MINGW)
if(NANA_CMAKE_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ) if(NANA_CMAKE_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
add_definitions(-DSTD_THREAD_NOT_SUPPORTED)
add_definitions(-DNANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ) add_definitions(-DNANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
endif(NANA_CMAKE_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ) endif(NANA_CMAKE_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
endif(MINGW) endif(MINGW)

6
include/nana/std_mutex.hpp
View File

@ -8,12 +8,12 @@
#include <windows.h> #include <windows.h>
#include <mutex> #include <mutex>
#include <condition_variable> #include <condition_variable>
#include <thread> //#include <thread>
#include <pthread.h> //#include <pthread.h>
#include <errno.h> #include <errno.h>
#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 */
#include <mingw.thread.h> #include <mingw.thread.h>
#include <mingw.mutex.h> #include <mingw.mutex.h>
#else #else

7
include/nana/std_thread.hpp
View File

@ -5,6 +5,7 @@
#if defined(STD_THREAD_NOT_SUPPORTED) #if defined(STD_THREAD_NOT_SUPPORTED)
#if defined(NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ) #if defined(NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
#include <mingw.thread.h> #include <mingw.thread.h>
#else #else
#include <boost/thread.hpp> #include <boost/thread.hpp>
@ -13,5 +14,11 @@ namespace std
typedef boost::thread thread; typedef boost::thread thread;
} }
#endif // (NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ) #endif // (NANA_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ)
#else
#include <thread>
#endif // (STD_THREAD_NOT_SUPPORTED) #endif // (STD_THREAD_NOT_SUPPORTED)
#endif // NANA_STD_THREAD_HPP #endif // NANA_STD_THREAD_HPP

3
source/gui/wvl.cpp
View File

@ -13,8 +13,9 @@
#include <nana/gui/wvl.hpp> #include <nana/gui/wvl.hpp>
#include <nana/gui/detail/bedrock.hpp> #include <nana/gui/detail/bedrock.hpp>
#include <thread> #include <nana/std_thread.hpp>
#include <iostream> #include <iostream>
#include <chrono>
//#define NANA_AUTOMATIC_GUI_TESTING //#define NANA_AUTOMATIC_GUI_TESTING
namespace nana namespace nana

1
source/system/dataexch.cpp
View File

@ -15,6 +15,7 @@
#include <nana/paint/graphics.hpp> #include <nana/paint/graphics.hpp>
#include <vector> #include <vector>
#include <cassert> #include <cassert>
#include <cstring>
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
#include <windows.h> #include <windows.h>