xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Wed Jan 31 21:03:24 UTC 2018
os/utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 510e7d0d869dcc008b1e11e21961f2c1c3cb9cd3
Author: Jeff Smith <whydoubt at gmail.com>
Date: Tue Dec 26 22:10:52 2017 -0600
os: Always return microseconds from GetTimeInMicros()
When a monotonic clock is not available, GetTimeInMicros() returns the
time in nanoseconds. Instead, return the time in microseconds, as the
name indicates.
Signed-off-by: Jeff Smith <whydoubt at gmail.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/os/utils.c b/os/utils.c
index 8a758f0b9..4a8d1249f 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -497,7 +497,7 @@ GetTimeInMicros(void)
#endif
X_GETTIMEOFDAY(&tv);
- return (CARD64) tv.tv_sec * (CARD64)1000000000 + (CARD64) tv.tv_usec * 1000;
+ return (CARD64) tv.tv_sec * (CARD64)1000000 + (CARD64) tv.tv_usec;
}
#endif
More information about the xorg-commit
mailing list