projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e7deff3
)
Make the NULL definition of OPENSSL_ia32cap_loc() compatible with the
author
Richard Levitte
<levitte@openssl.org>
Wed, 29 Apr 2009 13:40:28 +0000
(13:40 +0000)
committer
Richard Levitte
<levitte@openssl.org>
Wed, 29 Apr 2009 13:40:28 +0000
(13:40 +0000)
declaration in crypto.h.
crypto/cryptlib.c
patch
|
blob
|
history
diff --git
a/crypto/cryptlib.c
b/crypto/cryptlib.c
index 520e42d624604f2ae4e8b4ad61a1c0d080e48da1..de8d4eb2381c09a24f85015ee1b1a6d95484c76d 100644
(file)
--- 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)