From 731a1ce8fcdbbd1fa8f4f693c3f7f2b74d81e598 Mon Sep 17 00:00:00 2001 From: Wiimm Date: Thu, 1 Oct 2020 15:40:56 +0200 Subject: SZS v2.20a.beta6: Test Mac build --- project/src/lib-szs-create.c | 6 +++--- project/src/wszst.c | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'project/src') diff --git a/project/src/lib-szs-create.c b/project/src/lib-szs-create.c index f0ee32a..77b0fc0 100644 --- a/project/src/lib-szs-create.c +++ b/project/src/lib-szs-create.c @@ -808,12 +808,12 @@ enumError CreateSZS { StringCopyE( sd.path_rel, sd.path+sizeof(sd.path), *ptr ); struct stat st; - #if HAVE_FILEATTRIB_NSEC + #if HAVE_FILEATTRIB_NSEC if ( stat(sd.path,&st) || CompareTimeSpec(&st.st_mtim,&szs.fatt.mtime) < 0 ) - #else + #else const time_t mtime = stat(sd.path,&st) ? 0 : st.st_mtime; if ( mtime < szs.fatt.mtime ) - #endif + #endif { const bool is_compressed = IsCompressedFF(setup_param2.fform_file); if (is_compressed) diff --git a/project/src/wszst.c b/project/src/wszst.c index 15100f2..595d1d9 100644 --- a/project/src/wszst.c +++ b/project/src/wszst.c @@ -1785,11 +1785,7 @@ static enumError cmd_sha1() { if (long_count>1) { - #if HAVE_FILEATTRIB_NSEC - struct tm * tm = localtime(&szs.fatt.mtime.tv_sec); - #else - struct tm * tm = localtime(&szs.fatt.mtime); - #endif + struct tm * tm = localtime(&FILEATTRIB_SEC(szs.fatt.mtime)); char timbuf[40]; strftime(timbuf,sizeof(timbuf),"%F %T ",tm); fputs(timbuf,stdout); -- cgit v1.3.1