Fix typo, should be && rather than &

[oweals/openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index 9c4513552991bc3d08fabbe8cbed39c60c16850c..dd4c9ce9e0b86b8727cbb86cb80c731ec6ea096f 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -85,7 +85,7 @@ static void *(*malloc_ex_func) (size_t, const char *file, int line)
 #ifdef OPENSSL_SYS_VMS
 # if __INITIAL_POINTER_SIZE == 64
 #  define realloc _realloc64
-# else
+# elif __INITIAL_POINTER_SIZE == 32
 #  define realloc _realloc32
 # endif
 #endif
@@ -150,12 +150,12 @@ static long (*get_debug_options_func) (void) = NULL;
 int CRYPTO_set_mem_functions(void *(*m) (size_t), void *(*r) (void *, size_t),
                              void (*f) (void *))
 {
-    /* Dummy call just to ensure OPENSSL_init() gets linked in */
-    OPENSSL_init();
     if (!allow_customize)
         return 0;
     if ((m == 0) || (r == 0) || (f == 0))
         return 0;
+    /* Dummy call just to ensure OPENSSL_init() gets linked in */
+    OPENSSL_init();
     malloc_func = m;
     malloc_ex_func = default_malloc_ex;
     realloc_func = r;