[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  b05f231cd97d80a2a46b6f4d0b145e84c729c39b (commit)
      from  68f11e82d9c19e104f34bd5186decc98566738ca (commit)


- Log -----------------------------------------------------------------
commit b05f231cd97d80a2a46b6f4d0b145e84c729c39b
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 6 17:39:35 2016 +0200

    VMS: only use _realloc32 with /POINTER_SIZE=32
    
    This fixes the following error when building with no particular pointer size
    is specified (implied 32 bit):
    
        static void *(*realloc_func) (void *, size_t) = realloc;
        ................................................^
        %CC-E-UNDECLARED, In the initializer for realloc_func, "_realloc32" is not declared.
        at line number 93 in file DEV:[OPENSSL102.crypto]mem.c;1
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/mem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/mem.c b/crypto/mem.c
index 9c45135..06c3960 100644
--- 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