highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 23:18:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'signbugs' of https://github.com/wizeman/bitcoin

Browse Source 
Resolved minor conflict in main.cpp
This commit is contained in:
Gavin Andresen
2012-06-18 10:48:40 -04:00
parent 5204ca87e2 31ac53fbdc
commit 550c73f4c8
6 changed files with 148 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/util.h
View File

@@ -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;
}