fixed MIPSpro version in the comment

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 236dc5aa67b766cc46426e54cf4a06c23d4194d3..cd13eb058882e55cee011b27bd59f164cbde7523 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -79,8 +79,18 @@
 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

+#ifndef __DARWIN__

     #include <Timer.h>
     #include <DriverServices.h>
     #include <Timer.h>
     #include <DriverServices.h>

+#else
+    #include <Carbon/Carbon.h>
+#endif
+#endif
+
+#ifdef __WXPALMOS__
+    #include <DateTime.h>
+    #include <TimeMgr.h>
+    #include <SystemMgr.h>

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -286,7 +296,7 @@ wxLongLong wxGetLocalTimeMillis()
 
     // ftime() is void and not int in some mingw32 headers, so don't
     // test the return code (well, it shouldn't fail anyhow...)
 
     // ftime() is void and not int in some mingw32 headers, so don't
     // test the return code (well, it shouldn't fail anyhow...)

-    (void)ftime(&tp);
+    (void)::ftime(&tp);

     val *= tp.time;
     return (val + tp.millitm);
 #elif defined(__WXMAC__)
     val *= tp.time;
     return (val + tp.millitm);
 #elif defined(__WXMAC__)