VSI submission: avoid pointer size warnings in mem.c

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-08-03 21:22:34 +02:00
parent c78a34f475
commit 556c4b51d5

View File

@ -82,6 +82,14 @@ static void *default_malloc_ex(size_t num, const char *file, int line)
static void *(*malloc_ex_func) (size_t, const char *file, int line)
= default_malloc_ex;
#ifdef OPENSSL_SYS_VMS
# if __INITIAL_POINTER_SIZE == 64
# define realloc _realloc64
# else
# define realloc _realloc32
# endif
#endif
static void *(*realloc_func) (void *, size_t) = realloc;
static void *default_realloc_ex(void *str, size_t num,
const char *file, int line)
@ -92,7 +100,11 @@ static void *default_realloc_ex(void *str, size_t num,
static void *(*realloc_ex_func) (void *, size_t, const char *file, int line)
= default_realloc_ex;
static void (*free_func) (void *) = free;
#ifdef OPENSSL_SYS_VMS
static void (*free_func) (__void_ptr64) = free;
#else
static void (*free_func) (void *) = free;
#endif
static void *(*malloc_locked_func) (size_t) = malloc;
static void *default_malloc_locked_ex(size_t num, const char *file, int line)
@ -103,7 +115,11 @@ static void *default_malloc_locked_ex(size_t num, const char *file, int line)
static void *(*malloc_locked_ex_func) (size_t, const char *file, int line)
= default_malloc_locked_ex;
static void (*free_locked_func) (void *) = free;
#ifdef OPENSSL_SYS_VMS
static void (*free_locked_func) (__void_ptr64) = free;
#else
static void (*free_locked_func) (void *) = free;
#endif
/* may be changed as long as 'allow_customize_debug' is set */
/* XXX use correct function pointer types */