diff options
author | Andy Polyakov <appro@openssl.org> | 2005-07-05 11:44:45 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2005-07-05 11:44:45 +0000 |
commit | 1875e6db29fb832d3cac101024ccb1f690b35028 (patch) | |
tree | 21b9c820ea71319acbe4cf985219cffea69e9d86 /crypto | |
parent | 0962fbbf98bfb4ef060dc6a54d11636f01706cd0 (diff) |
Pull up Win64 support from 0.9.8.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/cryptlib.c | 2 | ||||
-rw-r--r-- | crypto/mem_dbg.c | 8 |
2 files changed, 9 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 diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index 557516bde9..8316485217 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -252,8 +252,16 @@ long CRYPTO_dbg_get_options(void) /* static int mem_cmp(MEM *a, MEM *b) */ static int mem_cmp(const void *a_void, const void *b_void) { +#ifdef _WIN64 + const char *a=(const char *)((const MEM *)a_void)->addr, + *b=(const char *)((const MEM *)b_void)->addr; + if (a==b) return 0; + else if (a>b) return 1; + else return -1; +#else return((const char *)((const MEM *)a_void)->addr - (const char *)((const MEM *)b_void)->addr); +#endif } /* static unsigned long mem_hash(MEM *a) */ |