Committing in .

 Patch needed for VMS

 Modified Files:
 	wxWindows/src/common/timercmn.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index b1556e325e252c2d37aab4b4085f8b1c94386393..07b66fe957f521ccf8f4ba81ef7bbdfcc25ab91a 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -156,7 +156,7 @@ long wxChrono::Time()
 
 
 // EXPERIMENTAL: comment this out if it doesn't compile.
 
 
 // EXPERIMENTAL: comment this out if it doesn't compile.

-#ifndef __VMS__
+#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 )

 bool wxGetLocalTime(long *timeZone, int *dstObserved)
 {
 #if defined(__MINGW32__)
 bool wxGetLocalTime(long *timeZone, int *dstObserved)
 {
 #if defined(__MINGW32__)


@@ -192,11 +192,14 @@ bool wxGetLocalTime(long *timeZone, int *dstObserved)
   *timeZone = timezone;
   *dstObserved = daylight;
 #  endif
   *timeZone = timezone;
   *dstObserved = daylight;
 #  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 ?
+#elif defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || \
+   defined(__SYSV__) || defined(__MWERKS__) || (defined(__GNUWIN32__) && \
+                                                  !defined(__MINGW32__))\
+       || defined( __VMS__ ) // || defined(__AIXV3__)
+#  if defined(__SYSV__) || (defined(__GNUWIN32__) && !defined(__MINGW32))
+#  ifndef __MWERKS__

   struct timeval tp;
 #  endif
   struct timeval tp;
 #  endif

-#  if defined(__SYSV__) || (defined(__GNUWIN32__) && !defined(__MINGW32))

   struct timezone tz;
   gettimeofday(&tp, &tz);
   *timeZone = 60*(tz.tz_minuteswest);
   struct timezone tz;
   gettimeofday(&tp, &tz);
   *timeZone = 60*(tz.tz_minuteswest);