Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No obnoxious warnings if threading is disabled.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2005-12-31 18:56:32 +00:00
parent 962a48f6f9
commit 5b52a68426
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/datetime.h
View File

@@ -57,7 +57,7 @@ class WXDLLIMPEXP_BASE wxDateSpan;
#define wxLocaltime_r localtime_r #define wxLocaltime_r localtime_r
#else #else
struct tm *wxLocaltime_r(const time_t*, struct tm*); struct tm *wxLocaltime_r(const time_t*, struct tm*);
#if !defined(__WINDOWS__) #if wxUSE_THREADS && !defined(__WINDOWS__)
// On Windows, localtime _is_ threadsafe! // On Windows, localtime _is_ threadsafe!
#warning using pseudo thread-safe wrapper for localtime to emulate localtime_r #warning using pseudo thread-safe wrapper for localtime to emulate localtime_r
#endif #endif
@@ -67,7 +67,7 @@ struct tm *wxLocaltime_r(const time_t*, struct tm*);
#define wxGmtime_r gmtime_r #define wxGmtime_r gmtime_r
#else #else
struct tm *wxGmtime_r(const time_t*, struct tm*); struct tm *wxGmtime_r(const time_t*, struct tm*);
#if !defined(__WINDOWS__) #if wxUSE_THREADS && !defined(__WINDOWS__)
// On Windows, gmtime _is_ threadsafe! // On Windows, gmtime _is_ threadsafe!
#warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r #warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r
#endif #endif

2
src/common/datetime.cpp
View File

@@ -169,7 +169,7 @@ wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter<wxDateTime> , wxFromStringCon
#endif #endif
#endif // !WX_TIMEZONE && !WX_GMTOFF_IN_TM #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; static wxMutex timeLock;
#endif #endif