generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andy Polyakov 2009-05-02 12:51:37 +00:00
parent 194274cb68
commit f00fdcd14d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/cryptlib.c
View File

@ -668,7 +668,6 @@ unsigned int *OPENSSL_ia32cap_loc(void) { return OPENSSL_ia32cap_P; }
#define OPENSSL_CPUID_SETUP #define OPENSSL_CPUID_SETUP
#if defined(_WIN32) #if defined(_WIN32)
typedef unsigned __int64 IA32CAP; typedef unsigned __int64 IA32CAP;
#define strtoull _strtoui64
#else #else
typedef unsigned long long IA32CAP; typedef unsigned long long IA32CAP;
#endif #endif
@ -682,7 +681,11 @@ void OPENSSL_cpuid_setup(void)
trigger=1; trigger=1;
if ((env=getenv("OPENSSL_ia32cap"))) if ((env=getenv("OPENSSL_ia32cap")))
#if defined(_WIN32)
{ if (!sscanf(env,"%I64i",&vec)) vec = strtoul(env,NULL,0); }
#else
vec = strtoull(env,NULL,0); vec = strtoull(env,NULL,0);
#endif
else else
vec = OPENSSL_ia32_cpuid(); vec = OPENSSL_ia32_cpuid();