generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FreeBSD 5 refuses to #include <malloc.h>. Fix compiler warning after

Browse Source 
http://cvs.openssl.org/chngview?cn=12843.
This commit is contained in:
Andy Polyakov 2005-01-25 22:07:22 +00:00
parent 14bcdb087f
commit e532a6c449
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/engine/eng_padlock.c
View File

@ -118,9 +118,11 @@ void ENGINE_load_padlock (void)
#ifdef COMPILE_HW_PADLOCK #ifdef COMPILE_HW_PADLOCK
/* We do these includes here to avoid header problems on platforms that /* We do these includes here to avoid header problems on platforms that
do not have the VIA padlock anyway... */ do not have the VIA padlock anyway... */
#include <malloc.h>
#ifdef _MSC_VER #ifdef _MSC_VER
# include <malloc.h>
# define alloca _alloca # define alloca _alloca
#else
# include <stdlib.h>
#endif #endif
/* Function for ENGINE detection and control */ /* Function for ENGINE detection and control */
@ -357,7 +359,7 @@ static inline void
padlock_bswapl(AES_KEY *ks) padlock_bswapl(AES_KEY *ks)
{ {
size_t i = sizeof(ks->rd_key)/sizeof(ks->rd_key[0]); 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--) { while (i--) {
asm volatile ("bswapl %0" : "+r"(*key)); asm volatile ("bswapl %0" : "+r"(*key));