X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17dff81c7141e142765b168ab225e5c61475669f..5b4f8dd5c0fe1bf44fb7971c669b036d4ad6eebe:/src/common/timercmn.cpp

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index ca30cb5be1..b4142eac9c 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -28,11 +28,12 @@
 
 #include "wx/timer.h"
 
-#ifdef __SVR4__
+#if defined(__SVR4__) && !defined(__SYSV__)
 #define __SYSV__
 #endif
 
 #include <time.h>
+
 #ifndef __WXMAC__
 #include <sys/types.h>
 #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__) || defined(__EMX__)
 #include <sys/time.h>
 #endif
 
@@ -50,10 +52,11 @@
 #include "windows.h"
 #endif
 
-#if defined(__SUN__) || defined(__OSF__)
+#if defined(__SUN__) || defined(__OSF__) || defined(__FreeBSD__)
 // At least on Sun, ftime is undeclared.
 // Need to be verified on other platforms.
 extern "C" int ftime(struct timeb *tp);
+//extern "C" int gettimeofday(struct timeval *tp, void *);
 // extern "C" time_t time(time_t);
 // #include <sys/timeb.h>
 #if defined(__SVR4__) && !defined(__ALPHA__)
@@ -70,15 +73,17 @@ extern "C" int gettimeofday(struct timeval *tp, void *);
 long wxStartTime = 0;
 void wxStartTimer(void)
 {
-#if defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) // || defined(__AIXV3__)
+#if defined(__EMX__) || defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) || \
+    (defined(__GNUWIN32__) && !defined(__MINGW32__)) // || defined(__AIXV3__)
   struct timeval tp;
-#if defined(__SYSV__) || (defined (__GNUWIN32__) && !defined (__MINGW32__))
+#if defined(__EMX__) || defined(__SYSV__) || (defined (__GNUWIN32__) && !defined (__MINGW32__))
   gettimeofday(&tp, (struct timezone *)NULL);
 #else
   gettimeofday(&tp);
 #endif
   wxStartTime = 1000*tp.tv_sec + tp.tv_usec/1000;
-#elif (defined(__SC__) || defined(__SGI__) || defined(___BSDI__) || defined(__ALPHA__) || defined(__MINGW32__) || defined(__MWERKS__))
+#elif (defined(__SC__) || defined(__SGI__) || defined(___BSDI__) || defined(__ALPHA__) || \
+       defined(__MINGW32__) || defined(__MWERKS__) || defined(__FreeBSD__) )
   time_t t0;
   struct tm *tp;
   time(&t0);
@@ -94,7 +99,8 @@ void wxStartTimer(void)
 // Returns elapsed time in milliseconds
 long wxGetElapsedTime(bool resetTimer)
 {
-#if defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) // || defined(__AIXV3__)
+#if defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) || \
+    (defined(__GNUWIN32__) && !defined(__MINGW32__)) // || defined(__AIXV3__)
   struct timeval tp;
 #if defined(__SYSV__) || (defined (__GNUWIN32__) && !defined (__MINGW32__))
   gettimeofday(&tp, (struct timezone *)NULL);
@@ -105,7 +111,8 @@ long wxGetElapsedTime(bool resetTimer)
   long newTime = 1000*tp.tv_sec + tp.tv_usec / 1000;
   if (resetTimer)
     wxStartTime = newTime;
-#elif (defined(__SC__) || defined(__SGI__) || defined(___BSDI__) || defined(__ALPHA__) || defined(__MINGW32__)|| defined(__MWERKS__))
+#elif (defined(__SC__) || defined(__SGI__) || defined(___BSDI__) || defined(__ALPHA__) || \
+  defined(__MINGW32__)|| defined(__MWERKS__) || defined(__FreeBSD__))
   time_t t0;
   struct tm *tp;
   time(&t0);
@@ -129,52 +136,58 @@ long wxGetElapsedTime(bool resetTimer)
 #ifndef __VMS__
 bool wxGetLocalTime(long *timeZone, int *dstObserved)
 {
-#if defined(__MINGW32__) && defined(__EGCS__)
-  time_t t0;
-  struct tm *tp;
-  time(&t0);
-  tp = localtime(&t0);
-  *timeZone = timezone; // tp->tm_gmtoff; // ???
-  *dstObserved = tp->tm_isdst;
-#elif defined(__MINGW32__)
+#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__)) && !defined(__GNUWIN32__) && !defined(__MWERKS__))
-#ifdef __BORLANDC__
+// not mingw32...
+#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WXMSW__) || defined(__WXPM__)) \
+   && !defined(__GNUWIN32__) && !defined(__MWERKS__) )
+#  if defined(__BORLANDC__)
   /* Borland uses underscores */
   *timeZone = _timezone;
   *dstObserved = _daylight;
-#else
+#  elif defined(__SALFORDC__)
+  *timeZone = _timezone;
+  *dstObserved = daylight;
+#  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__)
@@ -198,7 +211,7 @@ long wxGetCurrentTime(void)
 {
 #if defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) // || defined(__AIXV3__)
   struct timeval tp;
-#if defined(__SYSV__) || (defined (__GNUWIN32__) && !defined (__MINGW32__))
+#if defined(__SYSV__) || (defined (__GNUWIN32__) && !defined (__MINGW32__) || defined(__FreeBSD__))
   gettimeofday(&tp, (struct timezone *)NULL);
 #else
   gettimeofday(&tp);