Mesa (master): c11/threads: Fix nano to milisecond conversion.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Tue Mar 4 13:52:17 UTC 2014


Module: Mesa
Branch: master
Commit: f34d75d6f69f4c0bf391e0adf1fd469601b01b04
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f34d75d6f69f4c0bf391e0adf1fd469601b01b04

Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Mar  3 14:53:30 2014 +0000

c11/threads: Fix nano to milisecond conversion.

Per https://gist.github.com/yohhoy/2223710/#comment-710118

Cc: "10.0" "10.1" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Michel Dänzer <michel at daenzer.net>

---

 include/c11/threads_win32.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/c11/threads_win32.h b/include/c11/threads_win32.h
index be1a389..771db94 100644
--- a/include/c11/threads_win32.h
+++ b/include/c11/threads_win32.h
@@ -146,7 +146,7 @@ static unsigned __stdcall impl_thrd_routine(void *p)
 
 static DWORD impl_xtime2msec(const xtime *xt)
 {
-    return (DWORD)((xt->sec * 1000u) + (xt->nsec / 1000));
+    return (DWORD)((xt->sec * 1000U) + (xt->nsec / 1000000L));
 }
 
 #ifdef EMULATED_THREADS_USE_NATIVE_CALL_ONCE




More information about the mesa-commit mailing list