diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:02:38 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:02:38 +0000 |
| commit | 797d0b231bebcf2cfdb82f4d44b9a06ead2a6e3c (patch) | |
| tree | e020813e04c0d63487147f9b586b34367bed9252 /src/bitcoinrpc.cpp | |
| parent | 5951d9fe3224b11ba9ae45df4fe44804ec0efd83 (diff) | |
| parent | 9e98fe6f584d8bdd0ffe4d5dc5c0b908beb456db (diff) | |
| download | bitcoin-797d0b231bebcf2cfdb82f4d44b9a06ead2a6e3c.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/net.cpp
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 944f1415cc..4c0edb4e89 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1690,7 +1690,7 @@ Value getwork(const Array& params, bool fHelp) // Save mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig); - // Prebuild hash buffers + // Pre-build hash buffers char pmidstate[32]; char pdata[128]; char phash1[64]; @@ -1947,7 +1947,7 @@ string rfc1123Time() time(&now); struct tm* now_gmt = gmtime(&now); string locale(setlocale(LC_TIME, NULL)); - setlocale(LC_TIME, "C"); // we want posix (aka "C") weekday/month strings + setlocale(LC_TIME, "C"); // we want POSIX (aka "C") weekday/month strings strftime(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S +0000", now_gmt); setlocale(LC_TIME, locale.c_str()); return string(buffer); @@ -2594,7 +2594,7 @@ int CommandLineRPC(int argc, char *argv[]) int main(int argc, char *argv[]) { #ifdef _MSC_VER - // Turn off microsoft heap dump noise + // Turn off Microsoft heap dump noise _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); _CrtSetReportFile(_CRT_WARN, CreateFile("NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0)); #endif |