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

CMakeLists.txt

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

include/nana/std_mutex.hpp

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

include/nana/std_thread.hpp

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

source/gui/wvl.cpp

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

source/system/dataexch.cpp

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