diff options
| author | simon <simon@FreeBSD.org> | 2006-07-29 19:10:21 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2006-07-29 19:10:21 +0000 |
| commit | 9159ca2b0ed030ab3c19210cd933875c52c9ed3d (patch) | |
| tree | 540130ae2c7e1fe4219bbd47c0c8e30f8b396c81 /crypto/openssl/crypto/mem_dbg.c | |
| parent | 7067faff1677051a8f1f2ec6ce9e1950a5efd8e2 (diff) | |
| parent | fb3c70eda88d3175627edc6a3316b4508b3d29c5 (diff) | |
| download | FreeBSD-src-9159ca2b0ed030ab3c19210cd933875c52c9ed3d.zip FreeBSD-src-9159ca2b0ed030ab3c19210cd933875c52c9ed3d.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r160814,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'crypto/openssl/crypto/mem_dbg.c')
| -rw-r--r-- | crypto/openssl/crypto/mem_dbg.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/mem_dbg.c b/crypto/openssl/crypto/mem_dbg.c index e212de2..8316485 100644 --- a/crypto/openssl/crypto/mem_dbg.c +++ b/crypto/openssl/crypto/mem_dbg.c @@ -59,11 +59,11 @@ #include <stdio.h> #include <stdlib.h> #include <time.h> +#include "cryptlib.h" #include <openssl/crypto.h> #include <openssl/buffer.h> #include <openssl/bio.h> #include <openssl/lhash.h> -#include "cryptlib.h" static int mh_mode=CRYPTO_MEM_CHECK_OFF; /* The state changes to CRYPTO_MEM_CHECK_ON | CRYPTO_MEM_CHECK_ENABLE @@ -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) */ |
