diff options
| author | jkim <jkim@FreeBSD.org> | 2015-03-20 21:54:45 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-03-20 21:54:45 +0000 |
| commit | fe7bfd664683289b1b664debb31903b1cac6c5a3 (patch) | |
| tree | 9b8e2271d58d99f9cc13ad9487e2218ce84c1140 /secure/lib/libcrypto/opensslconf-x86.h | |
| parent | 388629696760e3d5edf34914d6411ebfda5d5a84 (diff) | |
| download | FreeBSD-src-fe7bfd664683289b1b664debb31903b1cac6c5a3.zip FreeBSD-src-fe7bfd664683289b1b664debb31903b1cac6c5a3.tar.gz | |
MFC: r280297
Merge OpenSSL 1.0.1m.
Relnotes: yes
Diffstat (limited to 'secure/lib/libcrypto/opensslconf-x86.h')
| -rw-r--r-- | secure/lib/libcrypto/opensslconf-x86.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/secure/lib/libcrypto/opensslconf-x86.h b/secure/lib/libcrypto/opensslconf-x86.h index 848d7a9..a3f2060 100644 --- a/secure/lib/libcrypto/opensslconf-x86.h +++ b/secure/lib/libcrypto/opensslconf-x86.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 */ @@ -63,6 +69,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 #define OPENSSL_CPUID_OBJ @@ -251,3 +260,6 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ +#ifdef __cplusplus +} +#endif |
