From b28828796ad6d65ac463b41bba153f74e4531a6b Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 14 Nov 2014 09:52:32 +0100 Subject: Update OpenSSL version --- main/openssl/crypto/opensslconf-static-trusty.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'main/openssl/crypto/opensslconf-static-trusty.h') diff --git a/main/openssl/crypto/opensslconf-static-trusty.h b/main/openssl/crypto/opensslconf-static-trusty.h index 06f9f982..bff5910c 100644 --- a/main/openssl/crypto/opensslconf-static-trusty.h +++ b/main/openssl/crypto/opensslconf-static-trusty.h @@ -1,6 +1,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 @@ -137,6 +140,9 @@ #ifndef OPENSSL_NO_UI # define OPENSSL_NO_UI #endif +#ifndef OPENSSL_NO_UNIT_TEST +# define OPENSSL_NO_UNIT_TEST +#endif #ifndef OPENSSL_NO_WHIRLPOOL # define OPENSSL_NO_WHIRLPOOL #endif @@ -287,6 +293,9 @@ # if defined(OPENSSL_NO_UI) && !defined(NO_UI) # define NO_UI # endif +# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST) +# define NO_UNIT_TEST +# endif # if defined(OPENSSL_NO_WHIRLPOOL) && !defined(NO_WHIRLPOOL) # define NO_WHIRLPOOL # endif @@ -446,3 +455,6 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ +#ifdef __cplusplus +} +#endif -- cgit v1.2.3