diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:13:46 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:13:46 +0000 |
| commit | 6ec9d30905e8df77e60d0195074920271abb977a (patch) | |
| tree | 59b21a9be7282b5ee3a2dc6c0b4f2d5a31882904 /src/util.cpp | |
| parent | 722ff53718333dc290760d528b7a561d29ab41a8 (diff) | |
| parent | 3703150d56ff6ee557ab330e55637c9c23835902 (diff) | |
| download | bitcoin-6ec9d30905e8df77e60d0195074920271abb977a.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.h
src/net.cpp
src/serialize.h
Diffstat (limited to 'src/util.cpp')
| -rw-r--r-- | src/util.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/util.cpp b/src/util.cpp index 393f927491..94bdba6ffb 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -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) |