summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorKochise <david.koch@9online.fr>2020-03-16 20:04:04 +0100
committerTomas Mraz <tmraz@fedoraproject.org>2020-04-17 13:21:46 +0200
commit8e0539bbb00cc4c98be440eb353689ff6f61028f (patch)
tree26163faf3d867b81d1121fc9a4c87aabfc580c87 /crypto
parent5f62ff49a9fdc9079aa6e9aefaf2cee51d2f4455 (diff)
Windows: Add type casting in CRYPTO_atomic_add to remove warning
CLA: trivial Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/11337) (cherry picked from commit 7da7b27eec58d1efc7012f002c45ddbdd61a5e79)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/threads_win.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index ba25d2719a..0e6d77103b 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;
}