X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8df6de970d7b4e4bc1f8701d1f3ab1adedde8f00..88f23fdd8366d57d15cba42d152539ff9ccbdd39:/src/common/stopwatch.cpp

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 21cd161679..f6f5638032 100644
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -41,10 +41,10 @@
 // ----------------------------------------------------------------------------
 
 #if defined(__WIN32__)
-    #include <windows.h>
+    #include "wx/msw/wrapwin.h"
 #endif
 
-#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__)
+#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
     #define HAVE_FTIME
 #endif
 
@@ -60,8 +60,14 @@
 #   undef HAVE_GETTIMEOFDAY
 #endif
 
+#ifndef __WXWINCE__
 #include <time.h>
-#ifndef __WXMAC__
+#else
+#include "wx/msw/private.h"
+#include "wx/msw/wince/time.h"
+#endif
+
+#if !defined(__WXMAC__) && !defined(__WXWINCE__)
     #include <sys/types.h>      // for time_t
 #endif
 
@@ -313,11 +319,16 @@ wxLongLong wxGetLocalTimeMillis()
     val *= wxGetLocalTime();
 
 // GRG: This will go soon as all WIN32 seem to have ftime
+// JACS: unfortunately not. WinCE doesn't have it.
 #if defined (__WIN32__)
     // If your platform/compiler needs to use two different functions
     // to get ms resolution, please do NOT just shut off these warnings,
     // drop me a line instead at <guille@iies.es>
+
+    // FIXME
+#ifndef __WXWINCE__
     #warning "Possible clock skew bug in wxGetLocalTimeMillis()!"
+#endif
 
     SYSTEMTIME st;
     ::GetLocalTime(&st);