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

2016-03-23 16:21:26 +08:00
parent c0e4a16880 238e298bc4
commit 82e201d403
5 changed files with 14 additions and 4 deletions
--- a/source/gui/wvl.cpp
+++ b/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
--- a/source/system/dataexch.cpp
+++ b/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>