From f00fdcd14dd82410fccf5a8b41e7ea38a90e7e79 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sat, 2 May 2009 12:51:37 +0000 Subject: [PATCH] cryptlib.c: eliminate dependency on _strtoui64, older Windows CRT don't have it. --- crypto/cryptlib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index de8d4eb238..bb54e6485a 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -668,7 +668,6 @@ unsigned int *OPENSSL_ia32cap_loc(void) { return OPENSSL_ia32cap_P; } #define OPENSSL_CPUID_SETUP #if defined(_WIN32) typedef unsigned __int64 IA32CAP; -#define strtoull _strtoui64 #else typedef unsigned long long IA32CAP; #endif @@ -682,7 +681,11 @@ void OPENSSL_cpuid_setup(void) trigger=1; if ((env=getenv("OPENSSL_ia32cap"))) +#if defined(_WIN32) + { if (!sscanf(env,"%I64i",&vec)) vec = strtoul(env,NULL,0); } +#else vec = strtoull(env,NULL,0); +#endif else vec = OPENSSL_ia32_cpuid(); -- 2.25.1