diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
| commit | 426a154a830ca2d9bae74612741ff86332f5c66e (patch) | |
| tree | 7937e26cb4336f7a8bfd41a8238859a89e83e4b3 /lib/libcrypto/cryptlib.h | |
| parent | 1ab62f029308adf86f7a805afd722d5170be8c34 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/cryptlib.h')
| -rw-r--r-- | lib/libcrypto/cryptlib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/cryptlib.h b/lib/libcrypto/cryptlib.h index fc249c57f37..1761f6b6687 100644 --- a/lib/libcrypto/cryptlib.h +++ b/lib/libcrypto/cryptlib.h @@ -99,7 +99,7 @@ extern "C" { #define HEX_SIZE(type) (sizeof(type)*2) void OPENSSL_cpuid_setup(void); -extern unsigned long OPENSSL_ia32cap_P; +extern unsigned int OPENSSL_ia32cap_P[]; void OPENSSL_showfatal(const char *,...); void *OPENSSL_stderr(void); extern int OPENSSL_NONPIC_relocated; |