From: Andy Polyakov <appro@openssl.org>
Date: Sat, 2 May 2009 12:51:37 +0000 (+0000)
Subject: cryptlib.c: eliminate dependency on _strtoui64, older Windows CRT don't have it.
X-Git-Tag: OpenSSL-fips-2_0-rc1~1694
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f00fdcd14dd82410fccf5a8b41e7ea38a90e7e79;p=oweals%2Fopenssl.git

cryptlib.c: eliminate dependency on _strtoui64, older Windows CRT don't have it.
---

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();