mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for pthreads on MSYS2 & MINGW

Browse Source
This commit is contained in:
Lealem Amedie 2023-10-17 09:16:41 -06:00
parent c23559a91c
commit b73a440205
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wolfssl/wolfcrypt/types.h
View File

@ -1377,8 +1377,7 @@ typedef struct w64wrapper {
typedef unsigned int THREAD_RETURN; typedef unsigned int THREAD_RETURN;
typedef size_t THREAD_TYPE; typedef size_t THREAD_TYPE;
#define WOLFSSL_THREAD #define WOLFSSL_THREAD
#elif (defined(_POSIX_THREADS) || defined(HAVE_PTHREAD)) && \ #elif (defined(_POSIX_THREADS) || defined(HAVE_PTHREAD))
!defined(__MINGW32__)
#ifndef __MACH__ #ifndef __MACH__
#include <pthread.h> #include <pthread.h>
typedef struct COND_TYPE { typedef struct COND_TYPE {

8
wolfssl/wolfcrypt/wc_port.h
View File

@ -60,6 +60,10 @@
/* THREADING/MUTEX SECTION */ /* THREADING/MUTEX SECTION */
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
#if defined(MINGW32) && !defined(SINGLE_THREADED)
#define WOLFSSL_PTHREADS
#include <pthread.h>
#endif
#ifdef WOLFSSL_GAME_BUILD #ifdef WOLFSSL_GAME_BUILD
#include "system/xtl.h" #include "system/xtl.h"
#else #else
@ -739,10 +743,10 @@ WOLFSSL_ABI WOLFSSL_API int wolfCrypt_Cleanup(void);
#endif #endif
#ifndef MAX_FILENAME_SZ #ifndef MAX_FILENAME_SZ
#define MAX_FILENAME_SZ 256 /* max file name length */ #define MAX_FILENAME_SZ 260 + 1 /* max file name length */
#endif #endif
#ifndef MAX_PATH #ifndef MAX_PATH
#define MAX_PATH 256 #define MAX_PATH 260 + 1
#endif #endif
WOLFSSL_LOCAL int wc_FileLoad(const char* fname, unsigned char** buf, WOLFSSL_LOCAL int wc_FileLoad(const char* fname, unsigned char** buf,