From: Adam (ThinLinc team) <146726448+CendioHalim@users.noreply.github.com>
Date: Mon, 29 Jul 2024 11:54:46 +0000 (+0200)
Subject: Detect MinGW 32 bit for NO_INTERLOCKEDOR64
X-Git-Tag: openssl-3.4.0-alpha1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c94d13a06965d4a3d9abf15d3cf5dc90c9d7c49c;p=thirdparty%2Fopenssl.git

Detect MinGW 32 bit for NO_INTERLOCKEDOR64

Builds using 32 bit MinGW will fail, due to the same reasoning described in commit 2d46a44ff24173d2cf5ea2196360cb79470d49c7.

CLA: trivial

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25025)
---

diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index fe57d8671b1..ce933173662 100644
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -23,7 +23,7 @@
  * only VC++ 2008 or earlier x86 compilers.
  */
 
-#if (defined(_MSC_VER) && defined(_M_IX86) && _MSC_VER <= 1600)
+#if ((defined(_MSC_VER) && defined(_M_IX86) && _MSC_VER <= 1600) || (defined(__MINGW32__) && !defined(__MINGW64__)))
 # define NO_INTERLOCKEDOR64
 #endif