diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-06-18 10:48:40 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-06-18 10:48:40 -0400 |
| commit | 550c73f4c87825e8524f7f164e0bc3e80c6822b9 (patch) | |
| tree | a674350fd0b5b4dd017ce5c553a268d960cbf287 /src/util.h | |
| parent | 5204ca87e23fb94f31e733c63efcb46980ad42ad (diff) | |
| parent | 31ac53fbdc2346876da201b9e1495565b38b46ba (diff) | |
Merge branch 'signbugs' of https://github.com/wizeman/bitcoin
Resolved minor conflict in main.cpp
Diffstat (limited to 'src/util.h')
| -rw-r--r-- | src/util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.h b/src/util.h index c1c91bdbc9..c9b2b2f17c 100644 --- a/src/util.h +++ b/src/util.h @@ -272,7 +272,7 @@ inline int64 GetPerformanceCounter() #else timeval t; gettimeofday(&t, NULL); - nCounter = t.tv_sec * 1000000 + t.tv_usec; + nCounter = (int64) t.tv_sec * 1000000 + t.tv_usec; #endif return nCounter; } |