ensure that WIN32 is defined, winsock2.h relies on it being defined and fails in...

[wxWidgets.git] / src / common / stopwatch.cpp

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 22ecaadecdf2ddd3f4cf8a35d1137b3e4aa7e0d8..fc12c801d24c203f6ce6630fc88dab725ded4eb8 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -79,15 +79,6 @@
     #include <sys/timeb.h>
 #endif
 
     #include <sys/timeb.h>
 #endif
 

-#ifdef __WXMAC__
-#ifndef __DARWIN__
-    #include <Timer.h>
-    #include <DriverServices.h>
-#else
-    #include <Carbon/Carbon.h>
-#endif
-#endif
-

 #ifdef __WXPALMOS__
     #include <DateTime.h>
     #include <TimeMgr.h>
 #ifdef __WXPALMOS__
     #include <DateTime.h>
     #include <TimeMgr.h>


@@ -285,26 +276,6 @@ wxLongLong wxGetLocalTimeMillis()
     (void)::ftime(&tp);
     val *= tp.time;
     return (val + tp.millitm);
     (void)::ftime(&tp);
     val *= tp.time;
     return (val + tp.millitm);

-#elif defined(__WXMAC__)
-
-    static UInt64 gMilliAtStart = 0;
-
-    Nanoseconds upTime = AbsoluteToNanoseconds( UpTime() );
-
-    if ( gMilliAtStart == 0 )
-    {
-        time_t start = time(NULL);
-        gMilliAtStart = ((UInt64) start) * 1000000L;
-        gMilliAtStart -= upTime.lo / 1000 ;
-        gMilliAtStart -= ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000);
-    }
-
-    UInt64 millival = gMilliAtStart;
-    millival += upTime.lo / (1000 * 1000);
-    millival += ( ( (UInt64) upTime.hi ) << 32 ) / (1000 * 1000);
-    val = millival;
-
-    return val;

 #else // no gettimeofday() nor ftime()
     // We use wxGetLocalTime() to get the seconds since
     // 00:00:00 Jan 1st 1970 and then whatever is available
 #else // no gettimeofday() nor ftime()
     // We use wxGetLocalTime() to get the seconds since
     // 00:00:00 Jan 1st 1970 and then whatever is available