The branch master has been updated
via 7da7b27eec58d1efc7012f002c45ddbdd61a5e79 (commit)
from 4350a6bd427f52d38f32b19f1c4b38a3afe62941 (commit)
- Log -----------------------------------------------------------------
commit 7da7b27eec58d1efc7012f002c45ddbdd61a5e79
Author: Kochise <[email protected]>
Date: Mon Mar 16 20:04:04 2020 +0100
Windows: Add type casting in CRYPTO_atomic_add to remove warning
CLA: trivial
Reviewed-by: Matt Caswell <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/11337)
-----------------------------------------------------------------------
Summary of changes:
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 43bd0f51d9..4d95cd3fbb 100644
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -155,7 +155,7 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a,
CRYPTO_THREAD_ID b)
int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
{
- *ret = InterlockedExchangeAdd(val, amount) + amount;
+ *ret = (int)InterlockedExchangeAdd((long volatile *)val, (long)amount) +
amount;
return 1;
}
