Merge branch 'master' into dev

CHANGELOG.md

@@ -1,3 +1,6 @@
+# v2.3.1
+- [#68](https://github.com/xmrig/xmrig/issues/68) Fixed compatibility with Docker containers, was nothing print on console.
+
 # v2.3.0
 - Added `--cpu-priority` option (0 idle, 2 normal to 5 highest).
 - Added `--user-agent` option, to set custom user-agent string for pool. For example `cpuminer-multi/0.1`.

CMakeLists.txt

@@ -125,6 +125,7 @@ else()
     set(EXTRA_LIBS pthread)
 endif()
 
+add_definitions(/D__STDC_FORMAT_MACROS)
 add_definitions(/DUNICODE)
 #add_definitions(/DAPP_DEBUG)
 
@@ -148,7 +149,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 
     if (WIN32)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-        add_definitions(/D__STDC_FORMAT_MACROS)
     else()
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
     endif()

README.md

@@ -18,9 +18,10 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin
 * [Contacts](#contacts)
 
 ## Features
-* High performance (290+ H/s on i7 6700).
+* High performance.
 * Official Windows support.
-* Small Windows executable, only 535 KB without dependencies.
+* Small Windows executable, without dependencies.
+* x86/x64 support.
 * Support for backup (failover) mining server.
 * keepalived support.
 * Command line options compatible with cpuminer.

src/log/ConsoleLog.cpp

@@ -133,7 +133,12 @@ void ConsoleLog::text(const char* fmt, va_list args)
 
 bool ConsoleLog::isWritable() const
 {
-    return uv_is_writable(reinterpret_cast<const uv_stream_t*>(&m_tty)) == 1 && uv_guess_handle(1) == UV_TTY;
+    if (uv_is_writable(reinterpret_cast<const uv_stream_t*>(&m_tty)) != 1) {
+        return false;
+    }
+
+    const uv_handle_type type = uv_guess_handle(1);
+    return type == UV_TTY || type == UV_NAMED_PIPE;
 }
 
 

src/version.h

@@ -26,15 +26,15 @@
 
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
-#define APP_DESC      "Monero (XMR) CPU miner"
-#define APP_VERSION   "2.3.0-dev"
+#define APP_DESC      "XMRig CPU miner"
+#define APP_VERSION   "2.3.1"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com"
 
 #define APP_VER_MAJOR  2
 #define APP_VER_MINOR  3
-#define APP_VER_BUILD  0
+#define APP_VER_BUILD  1
 #define APP_VER_REV    0
 
 #ifdef _MSC_VER