From 5c80b04ad533e531e552e7e775b6df48dd1fcecc Mon Sep 17 00:00:00 2001
From: miod <>
Date: Mon, 28 Apr 2014 21:14:50 +0000
Subject: Remove WIN32, WIN64 and MINGW32 tentacles. Also check for _LP64
 rather than __arch64__ (the former being more reliable than __LP64__ or
 __arch64__) to tell 64-bit int platforms apart from 32-bit int platforms.

Loosely based upon a diff from Martijn van Duren on tech@
---
 src/lib/libcrypto/engine/eng_aesni.c   | 4 ----
 src/lib/libcrypto/engine/eng_padlock.c | 7 +------
 src/lib/libcrypto/engine/eng_rsax.c    | 4 ----
 3 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'src/lib/libcrypto/engine')

diff --git a/src/lib/libcrypto/engine/eng_aesni.c b/src/lib/libcrypto/engine/eng_aesni.c
index 5fdb33bfde..d547d7f465 100644
--- a/src/lib/libcrypto/engine/eng_aesni.c
+++ b/src/lib/libcrypto/engine/eng_aesni.c
@@ -309,11 +309,7 @@ static void aesni_ofb128_encrypt(const unsigned char *in, unsigned char *out,
 }
 /* ===== Engine "management" functions ===== */
 
-#if defined(_WIN32)
-typedef unsigned __int64 IA32CAP;
-#else
 typedef unsigned long long IA32CAP;
-#endif
 
 /* Prepare the ENGINE structure for registration */
 static int
diff --git a/src/lib/libcrypto/engine/eng_padlock.c b/src/lib/libcrypto/engine/eng_padlock.c
index c27181ba75..5a80b2b16d 100644
--- a/src/lib/libcrypto/engine/eng_padlock.c
+++ b/src/lib/libcrypto/engine/eng_padlock.c
@@ -129,12 +129,7 @@ void ENGINE_load_padlock (void)
 /* We do these includes here to avoid header problems on platforms that
    do not have the VIA padlock anyway... */
 #include <stdlib.h>
-#ifdef _WIN32
-# include <malloc.h>
-# ifndef alloca
-#  define alloca _alloca
-# endif
-#elif defined(__GNUC__)
+#if defined(__GNUC__)
 # ifndef alloca
 #  define alloca(s) __builtin_alloca(s)
 # endif
diff --git a/src/lib/libcrypto/engine/eng_rsax.c b/src/lib/libcrypto/engine/eng_rsax.c
index c0f6851601..1b15b6f1a3 100644
--- a/src/lib/libcrypto/engine/eng_rsax.c
+++ b/src/lib/libcrypto/engine/eng_rsax.c
@@ -217,11 +217,7 @@ static int e_rsax_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 
 #ifndef OPENSSL_NO_RSA
 
-#ifdef _WIN32
-typedef unsigned __int64 UINT64;
-#else
 typedef unsigned long long UINT64;
-#endif
 typedef unsigned short UINT16;
 
 /* Table t is interleaved in the following manner:
-- 
cgit v1.2.3-55-g6feb