X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/510649e4d5e8eaf8967ddd082f3eb5945471eb5e..3372145d9daa42f680fc5aab7eb00e82d587c5a0:/src/common/timercmn.cpp?ds=sidebyside

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index fc09fd1313..b4142eac9c 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -83,7 +83,7 @@ void wxStartTimer(void)
 #endif
   wxStartTime = 1000*tp.tv_sec + tp.tv_usec/1000;
 #elif (defined(__SC__) || defined(__SGI__) || defined(___BSDI__) || defined(__ALPHA__) || \
-       defined(__MINGW32__) || defined(__MWERKS__) || defined(__FreeBSD__) ) 
+       defined(__MINGW32__) || defined(__MWERKS__) || defined(__FreeBSD__) )
   time_t t0;
   struct tm *tp;
   time(&t0);
@@ -136,59 +136,58 @@ long wxGetElapsedTime(bool resetTimer)
 #ifndef __VMS__
 bool wxGetLocalTime(long *timeZone, int *dstObserved)
 {
-#if defined(__MINGW32__) 
-  time_t t0;
-  struct tm *tp;
-  time(&t0);
-  tp = localtime(&t0);
-  *timeZone = _timezone; // tp->tm_gmtoff; // ???
-  *dstObserved = tp->tm_isdst;
-#elif 0
-  /* HH: This code apparently was needed by very old Mingw-gcc versions
-   * Modern mingw's don't need it. Since old gcc isn't supported anyway,
-   * I think this stuff can go */
+#if defined(__MINGW32__)
   time_t t0;
   struct tm *tp;
   time(&t0);
   tp = localtime(&t0);
+# if __GNUC__ == 2 && __GNUC_MINOR__ <= 8
+  // gcc 2.8.x or earlier
   timeb tz;
   ftime(& tz);
   *timeZone = tz._timezone;
+# else
+  // egcs or gcc 2.95
+  *timeZone = _timezone; // tp->tm_gmtoff; // ???
+# endif
   *dstObserved = tp->tm_isdst;
 #else
-
-#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WXMSW__)) \
+// not mingw32...
+#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WXMSW__) || defined(__WXPM__)) \
    && !defined(__GNUWIN32__) && !defined(__MWERKS__) )
-#if defined(__BORLANDC__)
+#  if defined(__BORLANDC__)
   /* Borland uses underscores */
   *timeZone = _timezone;
   *dstObserved = _daylight;
-#elif defined(__SALFORDC__)
+#  elif defined(__SALFORDC__)
   *timeZone = _timezone;
   *dstObserved = daylight;
-#else
+#  elif defined(__VISAGECPP__)
+  *timeZone = _timezone;
+  *dstObserved = daylight;
+#  else
   *timeZone = timezone;
   *dstObserved = daylight;
-#endif
+#  endif
 #elif defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) || defined(__MWERKS__) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) // || defined(__AIXV3__)
-#ifndef __MWERKS__ // shouldn't this be one scope below ?
+#  ifndef __MWERKS__ // shouldn't this be one scope below ?
   struct timeval tp;
-#endif 
-#if defined(__SYSV__) || (defined(__GNUWIN32__) && !defined(__MINGW32))
+#  endif
+#  if defined(__SYSV__) || (defined(__GNUWIN32__) && !defined(__MINGW32))
   struct timezone tz;
   gettimeofday(&tp, &tz);
   *timeZone = 60*(tz.tz_minuteswest);
   *dstObserved = tz.tz_dsttime;
-#else
+#  else
   time_t t0;
   struct tm *tp;
   time(&t0);
   tp = localtime(&t0);
-#ifndef __MWERKS__
+#  ifndef __MWERKS__
   *timeZone = tp->tm_gmtoff; // ???
-#else
+#  else
   *timeZone = 0 ;
-#endif
+#  endif
   *dstObserved = tp->tm_isdst;
 #endif
 #elif defined(__WXSTUBS__)