made wxGetTimeOfDay() public
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -99,4 +99,14 @@ extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
|
|||||||
|
|
||||||
#define wxGetCurrentTime() wxGetLocalTime()
|
#define wxGetCurrentTime() wxGetLocalTime()
|
||||||
|
|
||||||
|
// on some really old systems gettimeofday() doesn't have the second argument,
|
||||||
|
// define wxGetTimeOfDay() to hide this difference
|
||||||
|
#ifdef HAVE_GETTIMEOFDAY
|
||||||
|
#ifdef WX_GETTIMEOFDAY_NO_TZ
|
||||||
|
#define wxGetTimeOfDay(tv) gettimeofday(tv)
|
||||||
|
#else
|
||||||
|
#define wxGetTimeOfDay(tv) gettimeofday((tv), NULL)
|
||||||
|
#endif
|
||||||
|
#endif // HAVE_GETTIMEOFDAY
|
||||||
|
|
||||||
#endif // _WX_STOPWATCH_H_
|
#endif // _WX_STOPWATCH_H_
|
||||||
|
@@ -91,21 +91,6 @@
|
|||||||
#include <SystemMgr.h>
|
#include <SystemMgr.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
// macros
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
// on some really old systems gettimeofday() doesn't have the second argument,
|
|
||||||
// define wxGetTimeOfDay() to hide this difference
|
|
||||||
#ifdef HAVE_GETTIMEOFDAY
|
|
||||||
#ifdef WX_GETTIMEOFDAY_NO_TZ
|
|
||||||
struct timezone;
|
|
||||||
#define wxGetTimeOfDay(tv, tz) gettimeofday(tv)
|
|
||||||
#else
|
|
||||||
#define wxGetTimeOfDay(tv, tz) gettimeofday((tv), (tz))
|
|
||||||
#endif
|
|
||||||
#endif // HAVE_GETTIMEOFDAY
|
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// implementation
|
// implementation
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
@@ -279,7 +264,7 @@ wxLongLong wxGetLocalTimeMillis()
|
|||||||
|
|
||||||
#elif defined(HAVE_GETTIMEOFDAY)
|
#elif defined(HAVE_GETTIMEOFDAY)
|
||||||
struct timeval tp;
|
struct timeval tp;
|
||||||
if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
|
if ( wxGetTimeOfDay(&tp) != -1 )
|
||||||
{
|
{
|
||||||
val *= tp.tv_sec;
|
val *= tp.tv_sec;
|
||||||
return (val + (tp.tv_usec / 1000));
|
return (val + (tp.tv_usec / 1000));
|
||||||
|
Reference in New Issue
Block a user