fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/xmrig/master'

Browse source 
Conflicts:
	CHANGELOG.md
	src/Options.h
	src/Platform_unix.cpp
	src/log/ConsoleLog.cpp
	src/version.h
This commit is contained in:
BenDroid 2017-12-03 21:17:56 +01:00
commit 06328c5541
18 changed files with 2277 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/log/ConsoleLog.cpp
View file

@ -38,6 +38,7 @@
#include "log/ConsoleLog.h"
#include "log/Log.h"
#include "Options.h"
ConsoleLog::ConsoleLog(bool colors) :
@ -146,9 +147,10 @@ void ConsoleLog::print(va_list args)
}
if (!isWritable()) {
fprintf(stdout, m_buf);
fputs(m_buf, stdout);
fflush(stdout);
} else {
}
else {
uv_try_write(m_stream, &m_uvBuf, 1);
}
}