summaryrefslogtreecommitdiffstats
path: root/crypto/cryptlib.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2009-04-29 13:40:28 +0000
committerRichard Levitte <levitte@openssl.org>2009-04-29 13:40:28 +0000
commitd1417be75cdf92306d9e494fd2937c4210cb0335 (patch)
treec3ac7c08160668fca9a2f87e334b9aabc3290eda /crypto/cryptlib.c
parente7deff3cdf1c604b2120d4a6c4f73c0827f46156 (diff)
Make the NULL definition of OPENSSL_ia32cap_loc() compatible with the
declaration in crypto.h.
Diffstat (limited to 'crypto/cryptlib.c')
-rw-r--r--crypto/cryptlib.c2
1 files changed, 1 insertions, 1 deletions
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)