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/bn/asm/x86_64-gcc.c | 4 ----
 src/lib/libcrypto/bn/bn_exp.c         | 7 +------
 2 files changed, 1 insertion(+), 10 deletions(-)

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

diff --git a/src/lib/libcrypto/bn/asm/x86_64-gcc.c b/src/lib/libcrypto/bn/asm/x86_64-gcc.c
index acb0b40118..6a7fa4aea9 100644
--- a/src/lib/libcrypto/bn/asm/x86_64-gcc.c
+++ b/src/lib/libcrypto/bn/asm/x86_64-gcc.c
@@ -55,11 +55,7 @@
  *    machine.
  */
 
-#ifdef _WIN64
-#define BN_ULONG unsigned long long
-#else
 #define BN_ULONG unsigned long
-#endif
 
 #undef mul
 #undef mul_add
diff --git a/src/lib/libcrypto/bn/bn_exp.c b/src/lib/libcrypto/bn/bn_exp.c
index 2047e1cc3f..22ef643c02 100644
--- a/src/lib/libcrypto/bn/bn_exp.c
+++ b/src/lib/libcrypto/bn/bn_exp.c
@@ -114,12 +114,7 @@
 #include "bn_lcl.h"
 
 #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
-- 
cgit v1.2.3-55-g6feb