X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Futils.cpp;h=123b2d9192c11edfb2fda29f1a7aa22d6cb6cd66;hp=c9cc94dd6ed4b2efa85b9f72f6c4fb6a7d94c2d7;hb=967785734be5c3fc6f75da122c2d93ebbb338271;hpb=cd89068b8ebafdc0f888c1aa21498bb93b55d814 diff --git a/source/time/utils.cpp b/source/time/utils.cpp index c9cc94d..123b2d9 100644 --- a/source/time/utils.cpp +++ b/source/time/utils.cpp @@ -1,8 +1,3 @@ -/* -This file is part of libmspcore -Copyright © 2006 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ #ifdef WIN32 #include #else @@ -30,21 +25,21 @@ TimeStamp now() gettimeofday(&tv, 0); return TimeStamp(tv.tv_sec*1000000LL+tv.tv_usec); #else - static RawTime epoch=0; + static RawTime epoch = 0; if(!epoch) { SYSTEMTIME st; - st.wYear=1970; - st.wMonth=1; - st.wDay=1; - st.wHour=0; - st.wMinute=0; - st.wSecond=0; - st.wMilliseconds=0; + st.wYear = 1970; + st.wMonth = 1; + st.wDay = 1; + st.wHour = 0; + st.wMinute = 0; + st.wSecond = 0; + st.wMilliseconds = 0; FILETIME ft; SystemTimeToFileTime(&st, &ft); - epoch=(ft.dwLowDateTime+(static_cast(ft.dwHighDateTime)<<32))/10; + epoch = (ft.dwLowDateTime+(static_cast(ft.dwHighDateTime)<<32))/10; } FILETIME ft; @@ -79,8 +74,7 @@ Sleeps for the given time. int sleep(const TimeDelta &d) { #ifndef WIN32 - timespec ts; - d.fill_timespec(ts); + timespec ts = d; return nanosleep(&ts, 0); #else Sleep((DWORD)(d/msec));