diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-06-07 21:15:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-07 21:15:40 +0200 |
| commit | 807dd4997cd5c6c92f98bf08363eeff4b31ea138 (patch) | |
| tree | 6b8171d6b2e4a428643d31ee8536b59d362d1d6a /thirdparty/libwebsockets/win32helpers/gettimeofday.c | |
| parent | efdd0c4b894a4329469e3c8456b0440e7398c5d8 (diff) | |
| parent | 333e398413c87b06cef8391a898208260c5df3a6 (diff) | |
Merge pull request #19413 from Faless/lws_3.0
Update libwebsockets to version 3.0
Diffstat (limited to 'thirdparty/libwebsockets/win32helpers/gettimeofday.c')
| -rw-r--r-- | thirdparty/libwebsockets/win32helpers/gettimeofday.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/thirdparty/libwebsockets/win32helpers/gettimeofday.c b/thirdparty/libwebsockets/win32helpers/gettimeofday.c index 35dd73531d..08385c2320 100644 --- a/thirdparty/libwebsockets/win32helpers/gettimeofday.c +++ b/thirdparty/libwebsockets/win32helpers/gettimeofday.c @@ -1,36 +1,36 @@ -#include <time.h> -#include <windows.h> //I've omitted context line - -#include "gettimeofday.h" - -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 /= 10; /*convert into microseconds*/ +#include <time.h>
+#include <windows.h> //I've omitted context line
+
+#include "gettimeofday.h"
+
+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 /= 10; /*convert into microseconds*/
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; -} + 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;
+}
|