]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Detect MinGW 32 bit for NO_INTERLOCKEDOR64
authorAdam (ThinLinc team) <146726448+CendioHalim@users.noreply.github.com>
Mon, 29 Jul 2024 11:54:46 +0000 (13:54 +0200)
committerTomas Mraz <tomas@openssl.org>
Mon, 2 Sep 2024 08:24:58 +0000 (10:24 +0200)
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)

crypto/threads_win.c

index fe57d8671b15505aa55b9ef5d3063b503835fecf..ce9331736626a45e2923e70391a27aa14fea2a17 100644 (file)
@@ -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