From 04dbd766164738cf8bdcbf405854b8bdb323966a Mon Sep 17 00:00:00 2001 From: ritt Date: Wed, 27 Nov 2019 13:46:45 +0100 Subject: [PATCH] Fixed Windows 10 issues --- src/elogd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/elogd.c b/src/elogd.c index 5956d82c..e171d4f6 100755 --- a/src/elogd.c +++ b/src/elogd.c @@ -438,12 +438,14 @@ int my_read(int fh, void *buffer, unsigned int bytes) { return 0; } -/* workaround for wong timezone under MAX OSX */ +/* workaround for wong timezone under MacOSX */ long my_timezone() { #if defined(OS_MACOSX) || defined(__FreeBSD__) || defined(__OpenBSD__) time_t tp; time(&tp); return -localtime(&tp)->tm_gmtoff; +#elif defined(OS_WINNT) + return _timezone; #else return timezone; #endif @@ -21622,7 +21624,7 @@ void show_elog_list(LOGBOOK *lbs, int past_n, int last_n, int page_n, BOOL defau strcpy(str, "-"); else my_strftime(str, sizeof(str), format, ptms); - sprintf(str + strlen(str), " [%ld]", ltime); + sprintf(str + strlen(str), " [%ld]", (long)time); } else if (attr_flags[i] & AF_DATETIME) { @@ -21638,7 +21640,7 @@ void show_elog_list(LOGBOOK *lbs, int past_n, int last_n, int page_n, BOOL defau strcpy(str, "-"); else my_strftime(str, sizeof(str), format, ptms); - sprintf(str + strlen(str), " [%ld]", ltime); + sprintf(str + strlen(str), " [%ld]", (long)ltime); } xmlencode(str);