Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorvald Natvig <slicer@users.sourceforge.net>2007-07-19 19:50:36 +0400
committerThorvald Natvig <slicer@users.sourceforge.net>2007-07-19 19:50:36 +0400
commit0372cc254018ae6bae381cbbfcbf6dada65c663c (patch)
tree48fe16bef88fbf7abb7230970131052579968986 /src/Timer.cpp
parentd4a11186ef16d9d041e7d5ac83321839ae8ddbea (diff)
Use new Timer for murmur
git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@635 05730e5d-ab1b-0410-a4ac-84af385074fa
Diffstat (limited to 'src/Timer.cpp')
-rw-r--r--src/Timer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Timer.cpp b/src/Timer.cpp
index fb0097719..37d332007 100644
--- a/src/Timer.cpp
+++ b/src/Timer.cpp
@@ -61,8 +61,8 @@ quint64 Timer::now() {
quint64 Timer::now() {
struct timeval tv;
gettimeofday(&tv, NULL);
- quint64 e= tv.sec * 1000000LL;
- e += tv.usec;
+ quint64 e= tv.tv_sec * 1000000LL;
+ e += tv.tv_usec;
return e;
}
#else