1. make debugging macros compatible with ANSI build even in Unicode build (i.e.,...

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

diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 0739cf0f4bf2453d3d3cb456231d62176249d2e2..5a3776da285e13659f9c1e5135a3b472eb0ee652 100644 (file)
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/stopwatch.cpp
+// Name:        src/common/stopwatch.cpp

 // Purpose:     wxStopWatch and other non-GUI stuff from wx/timer.h
 // Author:
 //    Original version by Julian Smart
 // Purpose:     wxStopWatch and other non-GUI stuff from wx/timer.h
 // Author:
 //    Original version by Julian Smart


@@ -31,6 +31,9 @@
 #include "wx/stopwatch.h"
 
 #ifndef WX_PRECOMP
 #include "wx/stopwatch.h"
 
 #ifndef WX_PRECOMP

+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif

     #include "wx/intl.h"
     #include "wx/log.h"
 #endif //WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif //WX_PRECOMP


@@ -39,10 +42,6 @@
 // System headers
 // ----------------------------------------------------------------------------
 
 // System headers
 // ----------------------------------------------------------------------------
 

-#if defined(__WIN32__)
-    #include "wx/msw/wrapwin.h"
-#endif
-

 #if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
     #define HAVE_FTIME
 #endif
 #if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
     #define HAVE_FTIME
 #endif


@@ -92,21 +91,6 @@
     #include <SystemMgr.h>
 #endif
 
     #include <SystemMgr.h>
 #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
 // ============================================================================


@@ -280,7 +264,7 @@ wxLongLong wxGetLocalTimeMillis()
 
 #elif defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
 
 #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));
     {
         val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));


@@ -371,5 +355,3 @@ double wxGetLocalTimeMillis(void)
 }
 
 #endif // wxUSE_LONGLONG/!wxUSE_LONGLONG
 }
 
 #endif // wxUSE_LONGLONG/!wxUSE_LONGLONG

-
-