diff options
| author | jkim <jkim@FreeBSD.org> | 2015-03-20 19:16:18 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-03-20 19:16:18 +0000 |
| commit | d962da16eb69c08beb3d1028d1edbb20241cfead (patch) | |
| tree | bf9f5c26fab5c18be80ab30783e5c7e5082594fc /secure/lib/libcrypto/opensslconf-arm.h | |
| parent | 778929f2cccf19c8b69d8bcd0da2243bf9e3fb95 (diff) | |
| parent | 038f65e5fb1f35e1e485aa4781cda353c4e903f4 (diff) | |
| download | FreeBSD-src-d962da16eb69c08beb3d1028d1edbb20241cfead.zip FreeBSD-src-d962da16eb69c08beb3d1028d1edbb20241cfead.tar.gz | |
Merge OpenSSL 1.0.1m.
Diffstat (limited to 'secure/lib/libcrypto/opensslconf-arm.h')
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-arm.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/secure/lib/libcrypto/opensslconf-arm.h b/secure/lib/libcrypto/opensslconf-arm.h index dbe128f..57a7b61 100644 --- a/secure/lib/libcrypto/opensslconf-arm.h +++ b/secure/lib/libcrypto/opensslconf-arm.h @@ -2,6 +2,9 @@ /* opensslconf.h */ /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ +#ifdef __cplusplus +extern "C" { +#endif /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND @@ -27,6 +30,9 @@ #ifndef OPENSSL_NO_STORE # define OPENSSL_NO_STORE #endif +#ifndef OPENSSL_NO_UNIT_TEST +# define OPENSSL_NO_UNIT_TEST +#endif #endif /* OPENSSL_DOING_MAKEDEPEND */ @@ -66,6 +72,9 @@ # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) # define NO_STORE # endif +# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST) +# define NO_UNIT_TEST +# endif #endif /* crypto/opensslconf.h.in */ @@ -222,3 +231,6 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ +#ifdef __cplusplus +} +#endif |
