From: Andy Polyakov <appro@openssl.org>
Date: Tue, 25 Jan 2005 22:07:22 +0000 (+0000)
Subject: FreeBSD 5 refuses to #include <malloc.h>. Fix compiler warning after
X-Git-Tag: OpenSSL_0_9_7g~17^2~57
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e532a6c449049f4cfe611d3b5aa039d47a5d0018;p=oweals%2Fopenssl.git

FreeBSD 5 refuses to #include <malloc.h>. Fix compiler warning after
http://cvs.openssl.org/chngview?cn=12843.
---

diff --git a/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c
index 2d58dcb55b..4f64a06fb0 100644
--- a/crypto/engine/eng_padlock.c
+++ b/crypto/engine/eng_padlock.c
@@ -118,9 +118,11 @@ void ENGINE_load_padlock (void)
 #ifdef COMPILE_HW_PADLOCK
 /* We do these includes here to avoid header problems on platforms that
    do not have the VIA padlock anyway... */
-#include <malloc.h>
 #ifdef _MSC_VER
+# include <malloc.h>
 # define alloca _alloca
+#else
+# include <stdlib.h>
 #endif
 
 /* Function for ENGINE detection and control */
@@ -357,7 +359,7 @@ static inline void
 padlock_bswapl(AES_KEY *ks)
 {
 	size_t i = sizeof(ks->rd_key)/sizeof(ks->rd_key[0]);
-	unsigned long *key = ks->rd_key;
+	unsigned int *key = ks->rd_key;
 
 	while (i--) {
 		asm volatile ("bswapl %0" : "+r"(*key));