mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-08-01 03:34:39 +02:00
Merge pull request #8391 from dgarske/cmake_watcom
Fixes for Watcom compiler and new CI test
This commit is contained in:
@@ -1230,7 +1230,7 @@ exit:
|
||||
}
|
||||
|
||||
#if !defined(SINGLE_THREADED) && defined(WOLFSSL_THREAD_NO_JOIN)
|
||||
static THREAD_RETURN WOLFSSL_THREAD_NO_JOIN client_thread(void* args)
|
||||
static THREAD_RETURN_NOJOIN WOLFSSL_THREAD_NO_JOIN client_thread(void* args)
|
||||
{
|
||||
int ret;
|
||||
info_t* info = (info_t*)args;
|
||||
@@ -1243,7 +1243,7 @@ static THREAD_RETURN WOLFSSL_THREAD_NO_JOIN client_thread(void* args)
|
||||
THREAD_CHECK_RET(wolfSSL_CondSignal(&info->to_server.cond));
|
||||
THREAD_CHECK_RET(wolfSSL_CondEnd(&info->to_server.cond));
|
||||
|
||||
WOLFSSL_RETURN_FROM_THREAD(0);
|
||||
RETURN_FROM_THREAD_NOJOIN(0);
|
||||
}
|
||||
#endif /* !SINGLE_THREADED */
|
||||
#endif /* !NO_WOLFSSL_CLIENT */
|
||||
@@ -1675,7 +1675,7 @@ exit:
|
||||
}
|
||||
|
||||
#if !defined(SINGLE_THREADED) && defined(WOLFSSL_THREAD_NO_JOIN)
|
||||
static THREAD_RETURN WOLFSSL_THREAD_NO_JOIN server_thread(void* args)
|
||||
static THREAD_RETURN_NOJOIN WOLFSSL_THREAD_NO_JOIN server_thread(void* args)
|
||||
{
|
||||
int ret = 0;
|
||||
info_t* info = (info_t*)args;
|
||||
@@ -1703,7 +1703,7 @@ static THREAD_RETURN WOLFSSL_THREAD_NO_JOIN server_thread(void* args)
|
||||
THREAD_CHECK_RET(wolfSSL_CondSignal(&info->to_client.cond));
|
||||
THREAD_CHECK_RET(wolfSSL_CondEnd(&info->to_client.cond));
|
||||
|
||||
WOLFSSL_RETURN_FROM_THREAD(0);
|
||||
RETURN_FROM_THREAD_NOJOIN(0);
|
||||
}
|
||||
#endif /* !SINGLE_THREADED */
|
||||
#endif /* !NO_WOLFSSL_SERVER */
|
||||
|
Reference in New Issue
Block a user