Merge branch 'master' into incoming

coolwanglu · coolwanglu · commit ace5b9a178e5 · 2015-06-30T14:47:37.000+08:00
diff --git a/src/util/mingw.h b/src/util/mingw.h
@@ -14,6 +14,7 @@
 
 char *mkdtemp(char *temp);
 
+#include <direct.h>
 #define mkdir(A, B) _mkdir(A)
 #define stat _stat
 
