Two corrections to const fix

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

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 12732e144b010de690fd276371e9cb5917e2c8c9..c797fc0144ee085109bdde0917d4e821306d416f 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -169,7 +169,7 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
     #endif
 #endif // !WX_TIMEZONE && !WX_GMTOFF_IN_TM
 
     #endif
 #endif // !WX_TIMEZONE && !WX_GMTOFF_IN_TM
 

-#if wxUSE_THREADS
+#if (!defined(HAVE_LOCALTIME_R) || !defined(HAVE_GMTIME_R)) && wxUSE_THREADS && !defined(__WINDOWS__)

 static wxMutex timeLock;
 #endif
 
 static wxMutex timeLock;
 #endif
 


@@ -179,7 +179,7 @@ struct tm *wxLocaltime_r(const time_t* ticks, struct tm* temp)
 #if wxUSE_THREADS && !defined(__WINDOWS__)
   // No need to waste time with a mutex on windows since it's using
   // thread local storage for localtime anyway.
 #if wxUSE_THREADS && !defined(__WINDOWS__)
   // No need to waste time with a mutex on windows since it's using
   // thread local storage for localtime anyway.

-  wxMutexLocker(timeLock);
+  wxMutexLocker locker(timeLock);

 #endif
   memcpy(temp, localtime(ticks), sizeof(struct tm));
   return temp;
 #endif
   memcpy(temp, localtime(ticks), sizeof(struct tm));
   return temp;


@@ -192,7 +192,7 @@ struct tm *wxGmtime_r(const time_t* ticks, struct tm* temp)
 #if wxUSE_THREADS && !defined(__WINDOWS__)
   // No need to waste time with a mutex on windows since it's
   // using thread local storage for gmtime anyway.
 #if wxUSE_THREADS && !defined(__WINDOWS__)
   // No need to waste time with a mutex on windows since it's
   // using thread local storage for gmtime anyway.

-  wxMutexLocker(timeLock);
+  wxMutexLocker locker(timeLock);

 #endif
   memcpy(temp, gmtime(ticks), sizeof(struct tm));
   return temp;
 #endif
   memcpy(temp, gmtime(ticks), sizeof(struct tm));
   return temp;