X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17dff81c7141e142765b168ab225e5c61475669f..396bdd5ab1b1a66748642c67d8f81315a10557ad:/src/common/timercmn.cpp diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp index ca30cb5be1..34c14440b6 100644 --- a/src/common/timercmn.cpp +++ b/src/common/timercmn.cpp @@ -33,6 +33,7 @@ #endif #include + #ifndef __WXMAC__ #include #endif @@ -42,7 +43,8 @@ #endif #if defined(__linux__) || defined(__SVR4__) || defined(__SYSV__) || defined(__SGI__) || \ - defined(__ALPHA__) || defined(__GNUWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) + defined(__ALPHA__) || defined(__GNUWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ + defined(__SALFORDC__) #include #endif @@ -134,7 +136,7 @@ bool wxGetLocalTime(long *timeZone, int *dstObserved) struct tm *tp; time(&t0); tp = localtime(&t0); - *timeZone = timezone; // tp->tm_gmtoff; // ??? + *timeZone = _timezone; // tp->tm_gmtoff; // ??? *dstObserved = tp->tm_isdst; #elif defined(__MINGW32__) time_t t0; @@ -147,11 +149,15 @@ bool wxGetLocalTime(long *timeZone, int *dstObserved) *dstObserved = tp->tm_isdst; #else -#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WXMSW__)) && !defined(__GNUWIN32__) && !defined(__MWERKS__)) -#ifdef __BORLANDC__ +#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WXMSW__))\ + && !defined(__GNUWIN32__) && !defined(__MWERKS__) ) +#if defined(__BORLANDC__) /* Borland uses underscores */ *timeZone = _timezone; *dstObserved = _daylight; +#elif defined(__SALFORDC__) + *timeZone = _timezone; + *dstObserved = daylight; #else *timeZone = timezone; *dstObserved = daylight;