highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-27 17:49:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.x' into 0.6.0.x

Browse Source 
Conflicts:
	src/main.h
	src/net.cpp
	src/serialize.h
This commit is contained in:
Luke Dashjr
2012-06-14 18:13:46 +00:00
parent 722ff53718 3703150d56
commit 6ec9d30905
18 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/util.cpp
View File

@@ -23,6 +23,7 @@ namespace boost {
#include <boost/interprocess/sync/interprocess_mutex.hpp>
#include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
#include <boost/foreach.hpp>
#include <boost/thread.hpp>
using namespace std;
using namespace boost;
@@ -194,6 +195,8 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
if (fileout)
{
static bool fStartedNewLine = true;
static boost::mutex mutexDebugLog;
boost::mutex::scoped_lock scoped_lock(mutexDebugLog);
// Debug print useful for profiling
if (fLogTimestamps && fStartedNewLine)