diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-11-12 14:10:00 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-11-12 14:10:00 +0100 |
| commit | ff6f9f96fd372bb4d05c08dea7d317026edf2e94 (patch) | |
| tree | f34c1bfa5db3483b57830dc658fceffa6f4e8372 /crypto/cryptlib.c | |
| parent | Configure, x86gas.pl: fix linker warnings in 32-bit Darwin build. (diff) | |
| download | openssl-ff6f9f96fd372bb4d05c08dea7d317026edf2e94.tar.xz openssl-ff6f9f96fd372bb4d05c08dea7d317026edf2e94.zip | |
cryptlib.c, etc.: fix linker warnings in 64-bit Darwin build.
Diffstat (limited to 'crypto/cryptlib.c')
| -rw-r--r-- | crypto/cryptlib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 524daf037d..4b0a36c3d3 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -125,7 +125,7 @@ static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */ defined(__INTEL__) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) -unsigned int OPENSSL_ia32cap_P[2]; +extern unsigned int OPENSSL_ia32cap_P[2]; unsigned int *OPENSSL_ia32cap_loc(void) { return OPENSSL_ia32cap_P; } #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) @@ -164,6 +164,8 @@ void OPENSSL_cpuid_setup(void) OPENSSL_ia32cap_P[0] = (unsigned int)vec|(1<<10); OPENSSL_ia32cap_P[1] = (unsigned int)(vec>>32); } +#else +unsigned int OPENSSL_ia32cap_P[2]; #endif #else |