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/sha/sha.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

diff --git a/src/lib/libcrypto/sha/sha.h b/src/lib/libcrypto/sha/sha.h
index 435352c208..c0c3c16c08 100644
--- a/src/lib/libcrypto/sha/sha.h
+++ b/src/lib/libcrypto/sha/sha.h
@@ -154,10 +154,7 @@ void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
 #define SHA512_CBLOCK	(SHA_LBLOCK*8)	/* SHA-512 treats input data as a
 					 * contiguous array of 64 bit
 					 * wide big-endian values. */
-#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#define SHA_LONG64 unsigned __int64
-#define U64(C)     C##UI64
-#elif defined(__arch64__)
+#if defined(_LP64)
 #define SHA_LONG64 unsigned long
 #define U64(C)     C##UL
 #else
-- 
cgit v1.2.3-55-g6feb