From: Richard Levitte <levitte@openssl.org>
Date: Wed, 29 Apr 2009 13:40:28 +0000 (+0000)
Subject: Make the NULL definition of OPENSSL_ia32cap_loc() compatible with the
X-Git-Tag: OpenSSL-fips-2_0-rc1~1700
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d1417be75cdf92306d9e494fd2937c4210cb0335;p=oweals%2Fopenssl.git

Make the NULL definition of OPENSSL_ia32cap_loc() compatible with the
declaration in crypto.h.
---

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 520e42d624..de8d4eb238 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -697,7 +697,7 @@ void OPENSSL_cpuid_setup(void)
 #endif
 
 #else
-unsigned long *OPENSSL_ia32cap_loc(void) { return NULL; }
+unsigned int *OPENSSL_ia32cap_loc(void) { return NULL; }
 #endif
 int OPENSSL_NONPIC_relocated = 0;
 #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)