summaryrefslogtreecommitdiffstats
path: root/crypto/cryptlib.c
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2005-07-05 11:44:45 +0000
committerAndy Polyakov <appro@openssl.org>2005-07-05 11:44:45 +0000
commit1875e6db29fb832d3cac101024ccb1f690b35028 (patch)
tree21b9c820ea71319acbe4cf985219cffea69e9d86 /crypto/cryptlib.c
parent0962fbbf98bfb4ef060dc6a54d11636f01706cd0 (diff)
Pull up Win64 support from 0.9.8.
Diffstat (limited to 'crypto/cryptlib.c')
-rw-r--r--crypto/cryptlib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index e73d086eed..21332378cf 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -545,7 +545,6 @@ const char *CRYPTO_get_lock_name(int type)
unsigned long OPENSSL_ia32cap_P=0;
unsigned long *OPENSSL_ia32cap_loc(void) { return &OPENSSL_ia32cap_P; }
-int OPENSSL_NONPIC_relocated=0;
#if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
#define OPENSSL_CPUID_SETUP
@@ -572,6 +571,7 @@ void OPENSSL_cpuid_setup(void)
#else
unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; }
#endif
+int OPENSSL_NONPIC_relocated = 0;
#if !defined(OPENSSL_CPUID_SETUP)
void OPENSSL_cpuid_setup(void) {}
#endif