CI fixes and improved typing

Author: SamuelMarks

c89stringutils/c89stringutils_string_extras.h

@@ -16,6 +16,7 @@ extern "C" {
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 
 #if defined(_MSC_VER)
 #define NUM_FORMAT "%I64d"
@@ -89,9 +90,9 @@ extern "C" {
 
 #else
 
-#if !defined(__APPLE__) && !defined(__APPLE_CC__)
+#if !defined(__APPLE__) && !defined(__APPLE_CC__) && !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
 typedef int errno_t;
-#endif /* !defined(__APPLE__) && !defined(__APPLE_CC__) */
+#endif /* !defined(__APPLE__) && !defined(__APPLE_CC__) && !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__WATCOMC__) */
 
 #if defined(__linux__) || defined(linux) || defined(__linux) || defined(ANY_BSD)
 #define strerror_s strerror_r

c89stringutils/tests/test_string_extras.h

@@ -347,8 +347,13 @@ TEST x_mock_failures(void) {
   g_mock_vsnprintf_fail_call = 0;
 
   s = malloc(10);
-  if (s)
+  if (s) {
+#if defined(_MSC_VER)
+    strcpy_s(s, 10, "123");
+#else
     strcpy(s, "123");
+#endif
+  }
   g_mock_realloc_fail = 1;
   ASSERT_EQ(-1, c89stringutils_jasprintf(&s, "test"));
   ASSERT_EQ(-1, jasprintf(&s, "test"));