Merge pull request #99 from pks-t/pks-platform-compatibility

Platform compatibility with MinGW and HPE NonStop
clar-test · Sep 5, 2024 · 614d38d · 614d38d
2 parents 1516124 + b35ae61
commit 614d38d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/clar.c b/clar.c
@@ -19,9 +19,9 @@
 #include <sys/stat.h>
 
 #ifdef _WIN32
+#	define WIN32_LEAN_AND_MEAN
 #	include <windows.h>
 #	include <io.h>
-#	include <shellapi.h>
 #	include <direct.h>
 
 #	define _MAIN_CC __cdecl
@@ -68,7 +68,7 @@
 #		define PRIxZ "Ix"
 #	endif
 
-#	if defined(_MSC_VER) || defined(__MINGW32__)
+#	if defined(_MSC_VER) || (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))
 	typedef struct stat STAT_T;
 #	else
 	typedef struct _stat STAT_T;

diff --git a/clar/fs.h b/clar/fs.h
@@ -297,6 +297,8 @@ cl_fs_cleanup(void)
 {
 #ifdef CLAR_FIXTURE_PATH
 	fs_rm(fixture_path(_clar_path, "*"));
+#else
+	((void)fs_copy); /* unused */
 #endif
 }
 

diff --git a/clar/sandbox.h b/clar/sandbox.h
@@ -126,6 +126,12 @@ static int build_sandbox_path(void)
 	if (_mktemp_s(_clar_path, sizeof(_clar_path)) != 0)
 		return -1;
 
+	if (mkdir(_clar_path, 0700) != 0)
+		return -1;
+#elif defined(__TANDEM)
+	if (mktemp(_clar_path) == NULL)
+		return -1;
+
 	if (mkdir(_clar_path, 0700) != 0)
 		return -1;
 #else
-Original file line number
+Diff line change
@@ Expand Up / @@ -297,6 +297,8 @@ cl_fs_cleanup(void) @@
     {
     #ifdef CLAR_FIXTURE_PATH
     	fs_rm(fixture_path(_clar_path, "*"));
+    #else
+    	((void)fs_copy); /* unused */
     #endif
     }
@@ Expand Down @@