From b543aa01483f8b5dcdaafab5f8a7c148879fefda Mon Sep 17 00:00:00 2001
From: Eric Blankenhorn <eric@wolfssl.com>
Date: Fri, 22 Apr 2022 14:35:46 -0500
Subject: [PATCH] Fix for mingw builds

---
 tests/api.c                     | 3 ++-
 wolfcrypt/benchmark/benchmark.c | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/api.c b/tests/api.c
index a35b674d1..41b2008aa 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -39694,7 +39694,8 @@ static void test_wolfSSL_SESSION(void)
     unsigned int contextSz = (unsigned int)sizeof(context);
     int sz;
 #endif
-    int ret, err, sockfd;
+    int ret, err;
+    SOCKET_T sockfd;
     tcp_ready ready;
     func_args server_args;
     THREAD_TYPE serverThread;
diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c
index 0b788e32d..deb83ffe0 100644
--- a/wolfcrypt/benchmark/benchmark.c
+++ b/wolfcrypt/benchmark/benchmark.c
@@ -35,6 +35,10 @@
 #include <wolfssl/wolfcrypt/wc_port.h>
 #include <wolfssl/wolfcrypt/ecc.h>
 
+#ifdef HAVE_PTHREAD
+    #include <pthread.h>
+#endif
+
 /* Macro to disable benchmark */
 #ifndef NO_CRYPT_BENCHMARK
 
@@ -53,12 +57,14 @@
        defined(HAVE_PTHREAD) && !defined(HAVE_RENESAS_SYNC)
 
     #define WC_ENABLE_BENCH_THREADING
-    #if defined(_POSIX_THREADS) && !defined(__MINGW32__)
+    #if defined(_POSIX_THREADS)
         typedef void*         THREAD_RETURN;
         typedef pthread_t     THREAD_TYPE;
         #define WOLFSSL_THREAD
+        #if !defined(__MINGW32__)
         #define INFINITE (-1)
         #define WAIT_OBJECT_0 0L
+        #endif
     #elif defined(WOLFSSL_MDK_ARM)|| defined(WOLFSSL_KEIL_TCP_NET) || defined(FREESCALE_MQX)
         typedef unsigned int  THREAD_RETURN;
         typedef int           THREAD_TYPE;