diff options
| author | Robert Sloan <varomodt@google.com> | 2017-07-19 18:15:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-19 18:15:58 +0000 |
| commit | a346a3d43ebfa9f4ea4c54abfef137a8a691985b (patch) | |
| tree | 72668058b2e27f242835241c030994ed02c97478 | |
| parent | c8d1fc550cb021c2acad2c044b5df9ddbd9ee593 (diff) | |
| parent | 32f34e91e7b4191a17543397e58615615b99bf30 (diff) | |
| download | boringssl-a346a3d43ebfa9f4ea4c54abfef137a8a691985b.tar.gz | |
Set BoringSSL to use C++11. am: 682d4e9e96
am: 32f34e91e7
Change-Id: Ib6177dc806414b3bd9769bd2b018a2e0a5f5f337
| -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 { |