From: Kochise <david.koch@9online.fr>
Date: Mon, 16 Mar 2020 19:04:04 +0000 (+0100)
Subject: Windows: Add type casting in CRYPTO_atomic_add to remove warning
X-Git-Tag: OpenSSL_1_1_1g~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8e0539bbb00cc4c98be440eb353689ff6f61028f;p=oweals%2Fopenssl.git

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)
---

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;
 }