glib/gthread.c (gettime) GetSystemTimeAsFileTime() returns 100s of

2007-01-16  Tor Lillqvist  <tml@novell.com>

	* glib/gthread.c (gettime)
	* 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=/trunk/; revision=5276

diff --git a/ChangeLog b/ChangeLog
index d895667d29ebac632d035dfe945619a258a85195..2980b23e6b3d54e8321706c4d9b8885c43a4cfa1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-16  Tor Lillqvist  <tml@novell.com>
+
+       * glib/gthread.c (gettime): GetSystemTimeAsFileTime() returns 100s
+       of nanoseconds, so multiply by 100 to get nanoseconds which is
+       what we want.
+
 2007-01-15  Tor Lillqvist  <tml@novell.com>
 
        * glib/gmain.h (struct _GPollFD): Fix mistake in my last commit.

diff --git a/glib/gthread.c b/glib/gthread.c
index ad1b77fbd99bcc7d5e93655bf286d4d8a97fbc5e..683ad4a47c920dd22bc040cc2ff7bd519e1bc222 100644 (file)
--- 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/ChangeLog b/gthread/ChangeLog
index 121d60a95ce36d6be0bb0338013b84f0a3e820d3..82222eb80f5d8f0159d4254dfcee2046353bdb0f 100644 (file)
--- a/gthread/ChangeLog
+++ b/gthread/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-16  Tor Lillqvist  <tml@novell.com>
+
+       * gthread-win32.c (g_gettime_win32_impl):
+       GetSystemTimeAsFileTime() returns 100s of nanoseconds, so multiply
+       by 100 to get nanoseconds which is what we want.
+
 2006-12-28  Tor Lillqvist  <tml@novell.com>
 
        * gthread-win32.c (g_thread_impl_init): Correct link to discussion

diff --git a/gthread/gthread-win32.c b/gthread/gthread-win32.c
index 23c7bfd4df63c1672c2331cf5125d9ca32e88012..d55e265bb57f99b7af9a23aefda2c3d92e6f6777 100644 (file)
--- 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;
 }