X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1faf43f89c44b90d7605823f2a6d4db934bf2b0..ecd20d4a916884895dcd8873a9f1156e34f4ac89:/src/common/stopwatch.cpp?ds=sidebyside diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp index ed4987fc09..cb1c69a17a 100644 --- a/src/common/stopwatch.cpp +++ b/src/common/stopwatch.cpp @@ -9,7 +9,7 @@ // Modified by: // Created: 20.06.2003 (extracted from common/timercmn.cpp) // RCS-ID: $Id$ -// Copyright: (c) 1998-2003 wxWindows Team +// Copyright: (c) 1998-2003 wxWidgets Team // License: wxWindows license /////////////////////////////////////////////////////////////////////////////// @@ -193,12 +193,7 @@ long wxGetLocalTime() // Get UTC time as seconds since 00:00:00, Jan 1st 1970 long wxGetUTCTime() { -#ifdef _MSC_VER - unsigned -#endif - long timenow = 0; - time(&timenow); - return timenow; + return (long)time(NULL); } #if wxUSE_LONGLONG @@ -227,7 +222,7 @@ wxLongLong wxGetLocalTimeMillis() wxLongLong now( nowft.dwHighDateTime, nowft.dwLowDateTime ); // time in 100 nanoseconds return ( now - then ) / 10000.0; // time from 00:00:00 Jan 1st 1970 to now in milliseconds - + #elif defined(HAVE_GETTIMEOFDAY) struct timeval tp; if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 ) @@ -249,7 +244,7 @@ wxLongLong wxGetLocalTimeMillis() val *= tp.time; return (val + tp.millitm); #elif defined(__WXMAC__) - + static UInt64 gMilliAtStart = 0; Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() );