From 10f16a7bdbb85b47f5dda252a0819bf5d7b56240 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 16 Jan 2007 10:34:59 +0000 Subject: [PATCH] glib/gthread.c (gettime) GetSystemTimeAsFileTime() returns 100s of 2007-01-16 Tor Lillqvist * glib/gthread.c (gettime) * gthread/gthread-win32.c (g_gettime_win32_impl): GetSystemTimeAsFileTime() returns 100s of nanoseconds, so multiply by 100 to get nanoseconds which is what we want. svn path=/branches/glib-2-12/; revision=5273 --- ChangeLog | 6 ++++++ glib/gthread.c | 1 + gthread/gthread-win32.c | 1 + 3 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 540e4cd4d..955c1239f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-16 Tor Lillqvist + + * glib/gthread.c (gettime): GetSystemTimeAsFileTime() returns 100s + of nanoseconds, so multiply by 100 to get nanoseconds which is + what we want. + 2005-01-15 Matthias Clasen * configure.in: Bump version diff --git a/glib/gthread.c b/glib/gthread.c index ad1b77fbd..683ad4a47 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -555,6 +555,7 @@ gettime (void) guint64 v; GetSystemTimeAsFileTime ((FILETIME *)&v); + v *= 100; return v; #else diff --git a/gthread/gthread-win32.c b/gthread/gthread-win32.c index e8f1e62b9..6aead761e 100644 --- a/gthread/gthread-win32.c +++ b/gthread/gthread-win32.c @@ -551,6 +551,7 @@ g_gettime_win32_impl (void) guint64 v; GetSystemTimeAsFileTime ((FILETIME *)&v); + v *= 100; return v; }