From 731a1ce8fcdbbd1fa8f4f693c3f7f2b74d81e598 Mon Sep 17 00:00:00 2001
From: Wiimm <none>
Date: Thu, 1 Oct 2020 15:40:56 +0200
Subject: SZS v2.20a.beta6: Test Mac build

---
 project/Makefile             | 2 +-
 project/dclib/dclib-file.c   | 2 +-
 project/src/lib-szs-create.c | 6 +++---
 project/src/wszst.c          | 6 +-----
 4 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'project')

diff --git a/project/Makefile b/project/Makefile
index a58d597..8d6b2fa 100644
--- a/project/Makefile
+++ b/project/Makefile
@@ -59,7 +59,7 @@ WSTRT_SHORT		= wstrt
 WSTRT_LONG		= Wiimms StaticR Tool
 
 VERSION_NUM		= 2.20a
-BETA_VERSION		= 5
+BETA_VERSION		= 6
 			# 0:off  -1:"beta"  >0:"beta#"
 
 URI_HOME		= https://szs.wiimm.de/
diff --git a/project/dclib/dclib-file.c b/project/dclib/dclib-file.c
index ef14011..798fd16 100644
--- a/project/dclib/dclib-file.c
+++ b/project/dclib/dclib-file.c
@@ -257,7 +257,7 @@ FileAttrib_t * SetFileAttrib
 	ZeroFileAttrib(dest);
 	if (S_ISREG(src_stat->st_mode))
 	{
-         #if HAVE_FILEATTRIB_NSEC
+         #if HAVE_STATTIME_NSEC
 	    dest->atime = src_stat->st_atim;
 	    dest->mtime = src_stat->st_mtim;
 	    dest->ctime = src_stat->st_ctim;
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