aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-09-11 08:56:23 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-09-11 08:56:34 +0200
commit8040e938c56f65a8e46bc0ad0b6bd35c63185749 (patch)
tree02ca4e9f00b2f6af46a771766fca0b915e90933f
parentdef2fdb4b9b52fa908c11fe2f5a42ea04f8e9f11 (diff)
parente982b574a5e8878fb50f8f75c179474f2b1661dd (diff)
downloadbitcoin-8040e938c56f65a8e46bc0ad0b6bd35c63185749.tar.xz
Merge pull request #4892
e982b57 Use explicit fflush() instead of setvbuf() (Adam Weiss)
-rw-r--r--src/init.cpp1
-rw-r--r--src/util.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 31f64878fb..2e18f485bf 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -630,7 +630,6 @@ bool AppInit2(boost::thread_group& threadGroup)
fPrintToConsole = GetBoolArg("-printtoconsole", false);
fLogTimestamps = GetBoolArg("-logtimestamps", true);
fLogIPs = GetBoolArg("-logips", false);
- setvbuf(stdout, NULL, _IOLBF, 0);
#ifdef ENABLE_WALLET
bool fDisableWallet = GetBoolArg("-disablewallet", false);
#endif
diff --git a/src/util.cpp b/src/util.cpp
index 5a4e187f9e..20aff49c86 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -211,6 +211,7 @@ int LogPrintStr(const std::string &str)
{
// print to console
ret = fwrite(str.data(), 1, str.size(), stdout);
+ fflush(stdout);
}
else if (fPrintToDebugLog && AreBaseParamsConfigured())
{