From 5bc941f5cf754c402a266c77c1133c0b2d6f640b Mon Sep 17 00:00:00 2001 From: Georgi Valkov Date: Fri, 3 May 2024 07:51:08 +0300 Subject: threads_win: fix build error with VS2010 VC 2010 or earlier compilers do not support static inline. To work around this problem, we can use the ossl_inline macro. Fixes: crypto\threads_win.c(171) : error C2054: expected '(' to follow 'inline' crypto\threads_win.c(172) : error C2085: 'get_hold_current_qp' : not in formal parameter list crypto\threads_win.c(172) : error C2143: syntax error : missing ';' before '{' crypto\threads_win.c(228) : warning C4013: 'get_hold_current_qp' undefined; assuming extern returning int crypto\threads_win.c(228) : warning C4047: '=' : 'rcu_qp *' differs in levels of indirection from 'int' Signed-off-by: Georgi Valkov Reviewed-by: Tom Cosgrove Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/24370) (cherry picked from commit d8dd1dfdf5cf2343f6afd43dad4ce37045218624) --- crypto/threads_win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/threads_win.c b/crypto/threads_win.c index 9aec5e972f..64354dc42f 100644 --- a/crypto/threads_win.c +++ b/crypto/threads_win.c @@ -189,7 +189,7 @@ void ossl_rcu_lock_free(CRYPTO_RCU_LOCK *lock) OPENSSL_free(lock); } -static inline struct rcu_qp *get_hold_current_qp(CRYPTO_RCU_LOCK *lock) +static ossl_inline struct rcu_qp *get_hold_current_qp(CRYPTO_RCU_LOCK *lock) { uint32_t qp_idx; -- cgit v1.2.3