diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-04 18:55:15 +0000 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-05-04 18:55:15 +0000 |
commit | b2e5f797b5670c4dc7d0dfd696d21977575fe9ed (patch) | |
tree | 308157c6a728931ff26a8260e204c633e75ead1d /src/util.cpp | |
parent | 6a89317f621692e7d5c0c67b3a1440bf1b52b328 (diff) | |
parent | ad5a4c7c471912aa0bef52c33a1abfb01fe6d89d (diff) | |
download | bitcoin-b2e5f797b5670c4dc7d0dfd696d21977575fe9ed.tar.xz |
Merge branch '0.4.x' into 0.5.x
Diffstat (limited to 'src/util.cpp')
-rw-r--r-- | src/util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.cpp b/src/util.cpp index 211d1a036f..66161c7e5a 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -236,7 +236,7 @@ inline int OutputDebugStringF(const char* pszFormat, ...) *pend = '\0'; char* p1 = pszBuffer; char* p2; - while (p2 = strchr(p1, '\n')) + while ((p2 = strchr(p1, '\n'))) { p2++; char c = *p2; |