diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-21 01:40:40 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-21 01:40:40 +0000 |
| commit | 13829c6c99b8c763e60a17dad9508226a96abc44 (patch) | |
| tree | 0395b224ba187cd0ff0aae6c26da54e16acb5256 /src/util.h | |
| parent | 0969343320e4ccca5893a913afdc4ca1ffb0b5c4 (diff) | |
| parent | fad2231f8664434e913ad5c6d458fa9139492390 (diff) | |
| download | bitcoin-13829c6c99b8c763e60a17dad9508226a96abc44.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
doc/unit-tests.txt
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 e0821cce19..9910c338af 100644 --- a/src/util.h +++ b/src/util.h @@ -354,7 +354,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; } |