aboutsummaryrefslogtreecommitdiff
path: root/src/util.cpp
diff options
context:
space:
mode:
authorLuke Dashjr <[email protected]>2012-05-04 18:55:15 +0000
committerLuke Dashjr <[email protected]>2012-05-04 18:55:15 +0000
commitb2e5f797b5670c4dc7d0dfd696d21977575fe9ed (patch)
tree308157c6a728931ff26a8260e204c633e75ead1d /src/util.cpp
parentCheck earlier for blocks with duplicate transactions. Fixes #1167 (diff)
parentCheck earlier for blocks with duplicate transactions. Fixes #1167 (diff)
downloaddiscoin-b2e5f797b5670c4dc7d0dfd696d21977575fe9ed.tar.xz
discoin-b2e5f797b5670c4dc7d0dfd696d21977575fe9ed.zip
Merge branch '0.4.x' into 0.5.x
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 211d1a036..66161c7e5 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;