diff options
| author | Georgi Valkov <gvalkov@gmail.com> | 2024-05-03 07:51:08 +0300 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-05-14 15:26:03 +0200 |
| commit | 5bc941f5cf754c402a266c77c1133c0b2d6f640b (patch) | |
| tree | 597b5d57695d0f94d2afa92202ea6eb5686ca76a | |
| parent | a8d884e2b37c06ad9034a085d12a24b7023677e6 (diff) | |
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 <gvalkov@gmail.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24370)
(cherry picked from commit d8dd1dfdf5cf2343f6afd43dad4ce37045218624)
| -rw-r--r-- | crypto/threads_win.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |