X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57bd4c6031d438f11af0ec540136f49a928b923c..84e455807ee62925c98e18d2848954125b128018:/src/common/stopwatch.cpp?ds=sidebyside diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp index 6e0754d2d0..22ecaadecd 100644 --- a/src/common/stopwatch.cpp +++ b/src/common/stopwatch.cpp @@ -58,12 +58,15 @@ # undef HAVE_GETTIMEOFDAY #endif +#ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include #else #include "wx/msw/private.h" #include "wx/msw/wince/time.h" #endif +#endif // __WXPALMOS5__ + #if !defined(__WXMAC__) && !defined(__WXWINCE__) #include // for time_t @@ -91,21 +94,6 @@ #include #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 // ============================================================================ @@ -279,7 +267,7 @@ wxLongLong wxGetLocalTimeMillis() #elif defined(HAVE_GETTIMEOFDAY) struct timeval tp; - if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 ) + if ( wxGetTimeOfDay(&tp) != -1 ) { val *= tp.tv_sec; return (val + (tp.tv_usec / 1000));