diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-26 22:18:26 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-26 22:18:26 +0000 |
| commit | 0eca21c5fa489b87c6c2bd5c0798121350b4c16f (patch) | |
| tree | 4d44993990992776905e4d31cc9cd77bfedd0e70 /src/main.cpp | |
| parent | cd24f370929dcff6c790ce53dc70133259c80bff (diff) | |
| parent | d710ed5b637ab8a4fca433b9b6d331c1e4b97908 (diff) | |
| download | bitcoin-0eca21c5fa489b87c6c2bd5c0798121350b4c16f.tar.xz | |
Merge commit 'd710ed5' into 0.6.0.x
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index c30a2ecd4b..b1a40604da 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1903,7 +1903,7 @@ FILE* AppendBlockFile(unsigned int& nFileRet) if (fseek(file, 0, SEEK_END) != 0) return NULL; // FAT32 file size max 4GB, fseek and ftell max 2GB, so we must stay under 2GB - if (ftell(file) < 0x7F000000 - MAX_SIZE) + if (ftell(file) < (long)(0x7F000000 - MAX_SIZE)) { nFileRet = nCurrentBlockFile; return file; |