Solve some Win-specific problems and Bump 0.3.1

trojan-gfw · Nov 3, 2017 · bfffc15 · bfffc15
1 parent 19763f3
commit bfffc15
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/log.cpp b/src/log.cpp
@@ -33,6 +33,7 @@ Log::Level Log::level(INFO);
 void Log::log(const string &message, Level level) {
     if (level >= Log::level) {
         fprintf(stderr, "%s\n", message.c_str());
+        fflush(stderr);
     }
 }
 

diff --git a/src/log.h b/src/log.h
@@ -23,6 +23,10 @@
 #include <string>
 #include <boost/asio.hpp>
 
+#ifdef ERROR // windows.h
+#undef ERROR
+#endif
+
 class Log {
 public:
     enum Level {

diff --git a/src/version.cpp b/src/version.cpp
@@ -21,7 +21,7 @@
 #include <string>
 using namespace std;
 
-const string Version::version("0.3.0");
+const string Version::version("0.3.1");
 
 string Version::get_version() {
     return version;