diff options
| author | Andy Polyakov <appro@openssl.org> | 2004-08-29 16:36:05 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2004-08-29 16:36:05 +0000 |
| commit | 2b247cf81fbc320a313f952e2ea39cf63aa21010 (patch) | |
| tree | d81b7181197eb2360ef8048ca9b488eff54b6e0f /crypto/cryptlib.c | |
| parent | 746fc2526ffc17d57a5fb87568d01400cbcf62fd (diff) | |
OPENSSL_ia32cap final touches. Note that OPENSSL_ia32cap is no longer a
symbol, but a macro expanded as (*(OPENSSL_ia32cap_loc())). The latter
is the only one to be exported to application.
Diffstat (limited to 'crypto/cryptlib.c')
| -rw-r--r-- | crypto/cryptlib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 419d37ca5d..517678dbd4 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -541,23 +541,23 @@ const char *CRYPTO_get_lock_name(int type) #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__) -unsigned long OPENSSL_ia32cap=0; -unsigned long *OPENSSL_ia32cap_loc() { return &OPENSSL_ia32cap; } +unsigned long OPENSSL_ia32cap_P=0; +unsigned long *OPENSSL_ia32cap_loc(void) { return &OPENSSL_ia32cap_P; } #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) #define OPENSSL_CPUID_SETUP -void OPENSSL_cpuid_setup() +void OPENSSL_cpuid_setup(void) { static int trigger=0; - unsigned long OPENSSL_ia32_cpuid(); + unsigned long OPENSSL_ia32_cpuid(void); char *env; if (trigger) return; trigger=1; if ((env=getenv("OPENSSL_ia32cap"))) - OPENSSL_ia32cap = strtoul(env,NULL,0)|(1<<10); + OPENSSL_ia32cap_P = strtoul(env,NULL,0)|(1<<10); else - OPENSSL_ia32cap = OPENSSL_ia32_cpuid()|(1<<10); + OPENSSL_ia32cap_P = OPENSSL_ia32_cpuid()|(1<<10); /* * |(1<<10) sets a reserved bit to signal that variable * was initialized already... This is to avoid interference @@ -568,7 +568,7 @@ void OPENSSL_cpuid_setup() #endif #if !defined(OPENSSL_CPUID_SETUP) -void OPENSSL_cpuid_setup() {} +void OPENSSL_cpuid_setup(void) {} #endif #if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_DLL) |