Skip to content

Commit b73a440

Browse files
author
Lealem Amedie
committed
Fix for pthreads on MSYS2 & MINGW
1 parent c23559a commit b73a440

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

wolfssl/wolfcrypt/types.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,8 +1377,7 @@ typedef struct w64wrapper {
13771377
typedef unsigned int THREAD_RETURN;
13781378
typedef size_t THREAD_TYPE;
13791379
#define WOLFSSL_THREAD
1380-
#elif (defined(_POSIX_THREADS) || defined(HAVE_PTHREAD)) && \
1381-
!defined(__MINGW32__)
1380+
#elif (defined(_POSIX_THREADS) || defined(HAVE_PTHREAD))
13821381
#ifndef __MACH__
13831382
#include <pthread.h>
13841383
typedef struct COND_TYPE {

wolfssl/wolfcrypt/wc_port.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060

6161
/* THREADING/MUTEX SECTION */
6262
#ifdef USE_WINDOWS_API
63+
#if defined(MINGW32) && !defined(SINGLE_THREADED)
64+
#define WOLFSSL_PTHREADS
65+
#include <pthread.h>
66+
#endif
6367
#ifdef WOLFSSL_GAME_BUILD
6468
#include "system/xtl.h"
6569
#else
@@ -739,10 +743,10 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
739743
#endif
740744

741745
#ifndef MAX_FILENAME_SZ
742-
#define MAX_FILENAME_SZ 256 /* max file name length */
746+
#define MAX_FILENAME_SZ 260 + 1 /* max file name length */
743747
#endif
744748
#ifndef MAX_PATH
745-
#define MAX_PATH 256
749+
#define MAX_PATH 260 + 1
746750
#endif
747751

748752
WOLFSSL_LOCAL int wc_FileLoad(const char* fname, unsigned char** buf,

0 commit comments

Comments
 (0)