]> git.saurik.com Git - wxWidgets.git/commitdiff
Avoid warning about unused variable in wxGetUTCTimeMillis() in wxMSW.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 7 Jul 2012 13:27:44 +0000 (13:27 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 7 Jul 2012 13:27:44 +0000 (13:27 +0000)
Put the declaration of the variable only used under Unix inside the
corresponding "#if" branch.

See #14459.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/time.cpp

index 4a76dfac4874a9d8c8f7685a53ee6b7a3d62320e..5b2460ca6910797294e6b695428b9a80c510e656 100644 (file)
@@ -292,8 +292,6 @@ wxLongLong wxGetUTCTimeUSec()
 // Get local time as milliseconds since 00:00:00, Jan 1st 1970
 wxLongLong wxGetUTCTimeMillis()
 {
-    wxLongLong val = MILLISECONDS_PER_SECOND;
-
     // If possible, use a function which avoids conversions from
     // broken-up time structures to milliseconds
 #if defined(__WINDOWS__)
@@ -306,7 +304,10 @@ wxLongLong wxGetUTCTimeMillis()
     t /= 10000;
     t -= wxLL(11644473600000); // Unix - Windows epochs difference in ms.
     return t;
-#elif defined(HAVE_GETTIMEOFDAY)
+#else // !__WINDOWS__
+    wxLongLong val = MILLISECONDS_PER_SECOND;
+
+#if defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp) != -1 )
     {
@@ -342,6 +343,8 @@ wxLongLong wxGetUTCTimeMillis()
     val *= wxGetUTCTime();
     return val;
 #endif // time functions
+
+#endif // __WINDOWS__/!__WINDOWS__
 }
 
 wxLongLong wxGetLocalTimeMillis()