X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33d5c15653992d26b0f1eed95b6c0197e36dc9f1..1c067fe3c1e752658c63b4d556eb6a5468213860:/include/wx/datetime.h diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 42d9e4f926..18f0829a09 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -57,15 +57,21 @@ class WXDLLIMPEXP_BASE wxDateSpan; #define wxLocaltime_r localtime_r #else struct tm *wxLocaltime_r(const time_t*, struct tm*); +#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__) + // On Windows, localtime _is_ threadsafe! #warning using pseudo thread-safe wrapper for localtime to emulate localtime_r #endif +#endif #ifdef HAVE_GMTIME_R #define wxGmtime_r gmtime_r #else struct tm *wxGmtime_r(const time_t*, struct tm*); +#if wxUSE_THREADS && !defined(__WINDOWS__) && !defined(__WATCOMC__) + // On Windows, gmtime _is_ threadsafe! #warning using pseudo thread-safe wrapper for gmtime to emulate gmtime_r #endif +#endif /* The three (main) classes declared in this header represent: @@ -698,6 +704,7 @@ public: Month month = Inv_Month, int year = Inv_Year); +#if WXWIN_COMPATIBILITY_2_6 // sets the date to the given day of the given week in the year, // returns true on success and false if given date doesn't exist (e.g. // numWeek is > 53) @@ -710,6 +717,7 @@ public: wxDEPRECATED( wxDateTime GetWeek(wxDateTime_t numWeek, WeekDay weekday = Mon, WeekFlags flags = Monday_First) const ); +#endif // WXWIN_COMPATIBILITY_2_6 // returns the date corresponding to the given week day of the given // week (in ISO notation) of the specified year