diff options
| author | Robert Sloan <varomodt@google.com> | 2017-07-19 18:21:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-19 18:21:28 +0000 |
| commit | ba6449bb82e4b469612926298abe5da6d76fc6c8 (patch) | |
| tree | 8a99e0e79fda2a026de864ce2ac219365d08a60d | |
| parent | 390907455584fe326a660a2329237099a2e4d8e3 (diff) | |
| parent | 7e3e09f499bb4c40984a2414a44eba06d34319fc (diff) | |
| download | boringssl-ba6449bb82e4b469612926298abe5da6d76fc6c8.tar.gz | |
Set BoringSSL to use C++11. am: 682d4e9e96 am: 32f34e91e7 am: a346a3d43e
am: 7e3e09f499
Change-Id: I69115f652292354cdba8ba8dd080c4c69b684038
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | src/include/openssl/bn.h | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -116,6 +116,7 @@ cc_library_static { cc_library_static { name: "libcrypto_static", defaults: ["libcrypto_sources", "libcrypto_defaults", "boringssl_defaults", "boringssl_flags"], + cflags: ["-DOPENSSL_NO_CXX"], target: { host: { diff --git a/src/include/openssl/bn.h b/src/include/openssl/bn.h index 0d2068fa..ee331669 100644 --- a/src/include/openssl/bn.h +++ b/src/include/openssl/bn.h @@ -938,7 +938,8 @@ OPENSSL_EXPORT unsigned BN_num_bits_word(BN_ULONG l); #if defined(__cplusplus) } /* extern C */ -#if !defined(OPENSSL_NO_CXX) +#if (__cplusplus >= 201103L || (__cplusplus < 200000 && __cplusplus > 199711L)) && !defined(OPENSSL_NO_CXX) + extern "C++" { namespace bssl { |