diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-20 19:02:33 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-20 19:02:33 +0000 |
| commit | fad2231f8664434e913ad5c6d458fa9139492390 (patch) | |
| tree | b975968c772cee33ce5bd85a721a0085374169f6 /src/util.h | |
| parent | 506bf85de57bdf079824a14e492c112338768c2a (diff) | |
| parent | 3023e782bdaee3448e1543b482cf5cd022c9699f (diff) | |
| download | bitcoin-fad2231f8664434e913ad5c6d458fa9139492390.tar.xz | |
Merge branch '0.4.x' into 0.5.x
Conflicts:
src/main.cpp
src/serialize.h
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 69ac670f76..4526ff1be2 100644 --- a/src/util.h +++ b/src/util.h @@ -413,7 +413,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; } |