summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy White <jwhite@codeweavers.com>2012-04-26 12:09:50 -0500
committerAlon Levy <alevy@redhat.com>2012-05-15 19:24:22 +0300
commitd3bf13c9b4d102e0d1f1c1d51c8782569ea64a69 (patch)
tree456eb0647ea4644c1d9048bb868fe2f546efb2ee
parentca5ed4619244cca6eeaea571af824a44f771d383 (diff)
downloadspice-d3bf13c9b4d102e0d1f1c1d51c8782569ea64a69.tar.gz
spice-d3bf13c9b4d102e0d1f1c1d51c8782569ea64a69.tar.xz
spice-d3bf13c9b4d102e0d1f1c1d51c8782569ea64a69.zip
Force 64 bit multiplication on 32 bit systems; fixes a bug where the server times out the display channel freakily fast.
(cherry picked from commit 8d3ebe31ddb4004a4aa794bc1da444573a9914f8)
-rw-r--r--server/red_worker.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/red_worker.c b/server/red_worker.c
index 8a4315dd..387b78d6 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -4638,7 +4638,7 @@ static inline uint64_t red_now(void)
clock_gettime(CLOCK_MONOTONIC, &time);
- return time.tv_sec * 1000000000 + time.tv_nsec;
+ return ((uint64_t) time.tv_sec) * 1000000000 + time.tv_nsec;
}
static int red_process_cursor(RedWorker *worker, uint32_t max_pipe_size, int *ring_is_empty)