diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-08-18 17:13:09 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-08-26 14:08:47 +0200 |
| commit | 911ed439a81525e9ffafd5961fc2cb288cf0ba30 (patch) | |
| tree | a3b61e59b1f5453eb0f46cffca3c6b391e3e82d0 /cmake | |
| parent | 52d93f7b1750e89561566d211eb5cb38e45f1a2c (diff) | |
Get rid of MSVC impl of gettimeofday that's used nowhere
and is of unknown origin and quality.
Closes #1594.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/msvc/sys/time.h | 58 |
1 files changed, 2 insertions, 56 deletions
diff --git a/cmake/msvc/sys/time.h b/cmake/msvc/sys/time.h index dca0fdf51b..7594dae401 100644 --- a/cmake/msvc/sys/time.h +++ b/cmake/msvc/sys/time.h @@ -5,67 +5,13 @@ #ifndef _MSC_SYS_TIME_H_ #define _MSC_SYS_TIME_H_ -//http://social.msdn.microsoft.com/Forums/en/vcgeneral/thread/430449b3-f6dd-4e18-84de-eebd26a8d668 #include < time.h > -#include <windows.h> //I've omitted this line. -#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) - #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 -#else - #define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL -#endif #if _MSC_VER < 1900 struct timespec { - -time_t tv_sec; /* Seconds since 00:00:00 GMT, */ - -/* 1 January 1970 */ - -long tv_nsec; /* Additional nanoseconds since */ - -/* tv_sec */ - +time_t tv_sec; /*! \brief Seconds since 00:00:00 GMT, 1 January 1970 */ +long tv_nsec; /*! \brief Additional nanoseconds since tv_sec */ }; #endif -struct timezone -{ - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ -}; - -static inline int gettimeofday(struct timeval *tv, struct timezone *tz) -{ - FILETIME ft; - unsigned __int64 tmpres = 0; - static int tzflag; - - if (NULL != tv) - { - GetSystemTimeAsFileTime(&ft); - - tmpres |= ft.dwHighDateTime; - tmpres <<= 32; - tmpres |= ft.dwLowDateTime; - - /*converting file time to unix epoch*/ - tmpres -= DELTA_EPOCH_IN_MICROSECS; - tv->tv_sec = (long)(tmpres / 1000000UL); - tv->tv_usec = (long)(tmpres % 1000000UL); - } - - if (NULL != tz) - { - if (!tzflag) - { - _tzset(); - tzflag++; - } - tz->tz_minuteswest = _timezone / 60; - tz->tz_dsttime = _daylight; - } - - return 0; -} - #endif //_MSC_SYS_TIME_H_ |