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

use tm_gmtoff instead of timezone variable if tm struct member exists

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-05-12 09:17:04 +00:00
parent 62cc730f58
commit 0779cc9a66
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/datetime.cpp
View File

@@ -97,7 +97,7 @@
#undef HAVE_STRPTIME #undef HAVE_STRPTIME
#endif // broken strptime() #endif // broken strptime()
#ifndef WX_TIMEZONE #if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM)
#if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__) #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
#define WX_TIMEZONE _timezone #define WX_TIMEZONE _timezone
#elif defined(__MWERKS__) #elif defined(__MWERKS__)
@@ -118,10 +118,12 @@
return timezone; return timezone;
} }
#define WX_TIMEZONE wxGetTimeZone() #define WX_TIMEZONE wxGetTimeZone()
#elif defined(__DARWIN__)
#define WX_GMTOFF_IN_TM
#else // unknown platform - try timezone #else // unknown platform - try timezone
#define WX_TIMEZONE timezone #define WX_TIMEZONE timezone
#endif #endif
#endif // !WX_TIMEZONE #endif // !WX_TIMEZONE && !WX_GMTOFF_IN_TM
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// macros // macros
@@ -261,20 +263,31 @@ static int GetTimeZone()
{ {
// set to TRUE when the timezone is set // set to TRUE when the timezone is set
static bool s_timezoneSet = FALSE; static bool s_timezoneSet = FALSE;
#ifdef WX_GMTOFF_IN_TM
static long gmtoffset = LONG_MAX; // invalid timezone
#endif
wxCRIT_SECT_LOCKER(lock, gs_critsectTimezone); wxCRIT_SECT_LOCKER(lock, gs_critsectTimezone);
if ( !s_timezoneSet ) if ( !s_timezoneSet )
{ {
// just call localtime() instead of figuring out whether this system // just call localtime() instead of figuring out whether this system
// supports tzset(), _tzset() or something else // supports tzset(), _tzset() or something else
time_t t = 0; time_t t = 0;
struct tm *tm;
(void)localtime(&t); tm = localtime(&t);
s_timezoneSet = TRUE; s_timezoneSet = TRUE;
#ifdef WX_GMTOFF_IN_TM
gmtoffset = tm->tm_gmtoff;
#endif
} }
#ifdef WX_GMTOFF_IN_TM
return (int)gmtoffset;
#else
return (int)WX_TIMEZONE; return (int)WX_TIMEZONE;
#endif
} }
// return the integral part of the JDN for the midnight of the given date (to // return the integral part of the JDN for the midnight of the given date (to