diff options
| author | Luke Dashjr <[email protected]> | 2012-05-04 18:57:03 +0000 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-05-04 18:57:03 +0000 |
| commit | a1a5a890631beaf40236ab417b2f9816ccbae5a1 (patch) | |
| tree | f4a760bb91cab4a4e16b2338650d1665e2eef02d /src/util.cpp | |
| parent | Merge branch '0.5.x' into 0.6.0.x (diff) | |
| parent | Merge branch '0.4.x' into 0.5.x (diff) | |
| download | discoin-a1a5a890631beaf40236ab417b2f9816ccbae5a1.tar.xz discoin-a1a5a890631beaf40236ab417b2f9816ccbae5a1.zip | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.cpp
src/serialize.h
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 039c482f7..bfc0eb81d 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -237,7 +237,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; |