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
This commit is contained in:
@@ -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)
|
bool wxGetLocalTime(long *timeZone, int *dstObserved)
|
||||||
{
|
{
|
||||||
#if defined(__MINGW32__)
|
#if defined(__MINGW32__)
|
||||||
@@ -192,11 +192,14 @@ bool wxGetLocalTime(long *timeZone, int *dstObserved)
|
|||||||
*timeZone = timezone;
|
*timeZone = timezone;
|
||||||
*dstObserved = daylight;
|
*dstObserved = daylight;
|
||||||
# endif
|
# endif
|
||||||
#elif defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || defined(__SYSV__) || defined(__MWERKS__) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) // || defined(__AIXV3__)
|
#elif defined(__xlC__) || defined(__AIX__) || defined(__SVR4__) || \
|
||||||
# ifndef __MWERKS__ // shouldn't this be one scope below ?
|
defined(__SYSV__) || defined(__MWERKS__) || (defined(__GNUWIN32__) && \
|
||||||
|
!defined(__MINGW32__))\
|
||||||
|
|| defined( __VMS__ ) // || defined(__AIXV3__)
|
||||||
|
# if defined(__SYSV__) || (defined(__GNUWIN32__) && !defined(__MINGW32))
|
||||||
|
# ifndef __MWERKS__
|
||||||
struct timeval tp;
|
struct timeval tp;
|
||||||
# endif
|
# endif
|
||||||
# if defined(__SYSV__) || (defined(__GNUWIN32__) && !defined(__MINGW32))
|
|
||||||
struct timezone tz;
|
struct timezone tz;
|
||||||
gettimeofday(&tp, &tz);
|
gettimeofday(&tp, &tz);
|
||||||
*timeZone = 60*(tz.tz_minuteswest);
|
*timeZone = 60*(tz.tz_minuteswest);
|
||||||
|
Reference in New Issue
Block a user