From 39affc045124e15a0e89a0629a9370725948dc26 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 8 Mar 2007 01:44:16 +0000
Subject: [PATCH] made wxGetTimeOfDay() public

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/stopwatch.h   | 10 ++++++++++
 src/common/stopwatch.cpp | 17 +----------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h
index dec4fa2905..cc12e772a0 100644
--- a/include/wx/stopwatch.h
+++ b/include/wx/stopwatch.h
@@ -99,4 +99,14 @@ extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
 
 #define wxGetCurrentTime() wxGetLocalTime()
 
+// 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
+        #define wxGetTimeOfDay(tv)      gettimeofday(tv)
+    #else
+        #define wxGetTimeOfDay(tv)      gettimeofday((tv), NULL)
+    #endif
+#endif // HAVE_GETTIMEOFDAY
+
 #endif // _WX_STOPWATCH_H_
diff --git a/src/common/stopwatch.cpp b/src/common/stopwatch.cpp
index 6e0754d2d0..5a3776da28 100644
--- a/src/common/stopwatch.cpp
+++ b/src/common/stopwatch.cpp
@@ -91,21 +91,6 @@
     #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
 // ============================================================================
@@ -279,7 +264,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));