Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Windows 10 issues

Browse Source
This commit is contained in:
ritt 2019-11-27 13:46:45 +01:00
parent ccd2bee54f
commit 04dbd76616
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/elogd.c
View File

@ -438,12 +438,14 @@ int my_read(int fh, void *buffer, unsigned int bytes) {
return 0; return 0;
} }
/* workaround for wong timezone under MAX OSX */ /* workaround for wong timezone under MacOSX */
long my_timezone() { long my_timezone() {
#if defined(OS_MACOSX) || defined(__FreeBSD__) || defined(__OpenBSD__) #if defined(OS_MACOSX) || defined(__FreeBSD__) || defined(__OpenBSD__)
time_t tp; time_t tp;
time(&tp); time(&tp);
return -localtime(&tp)->tm_gmtoff; return -localtime(&tp)->tm_gmtoff;
#elif defined(OS_WINNT)
return _timezone;
#else #else
return timezone; return timezone;
#endif #endif
@ -21622,7 +21624,7 @@ void show_elog_list(LOGBOOK *lbs, int past_n, int last_n, int page_n, BOOL defau
strcpy(str, "-"); strcpy(str, "-");
else else
my_strftime(str, sizeof(str), format, ptms); 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) { } 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, "-"); strcpy(str, "-");
else else
my_strftime(str, sizeof(str), format, ptms); my_strftime(str, sizeof(str), format, ptms);
sprintf(str + strlen(str), " [%ld]", ltime); sprintf(str + strlen(str), " [%ld]", (long)ltime);
} }
xmlencode(str); xmlencode(str);