diff options
| author | David Benjamin <davidben@google.com> | 2018-11-09 13:21:02 -0600 |
|---|---|---|
| committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | 2018-11-09 19:33:34 +0000 |
| commit | f09df6930f86ef5d0fbc4b0f6163f8b4467b86f9 (patch) | |
| tree | b0e1534b997fb9849ebc8376d8fa286390d8b1a7 /include/openssl/ec.h | |
| parent | 7d10ab594cc85a0411041d086c6c101f3e98b4ee (diff) | |
| download | boringssl-f09df6930f86ef5d0fbc4b0f6163f8b4467b86f9.zip boringssl-f09df6930f86ef5d0fbc4b0f6163f8b4467b86f9.tar.gz boringssl-f09df6930f86ef5d0fbc4b0f6163f8b4467b86f9.tar.bz2 | |
Don't include openssl/ec_key.h under extern "C".
Reportedly some combination of C++ modules and old clang gets upset.
That seems an inadvisable combination, but including headers under
extern "C" is rude, so fix it.
Change-Id: I12f873e1be41697b67f2b1145387a3c6fc769c28
Reviewed-on: https://boringssl-review.googlesource.com/c/33024
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Diffstat (limited to 'include/openssl/ec.h')
| -rw-r--r-- | include/openssl/ec.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 41a9c34..966393e 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -348,13 +348,15 @@ OPENSSL_EXPORT size_t EC_get_builtin_curves(EC_builtin_curve *out_curves, // EC_POINT_clear_free calls |EC_POINT_free|. OPENSSL_EXPORT void EC_POINT_clear_free(EC_POINT *point); -// Old code expects to get EC_KEY from ec.h. -#include <openssl/ec_key.h> - #if defined(__cplusplus) } // extern C +#endif +// Old code expects to get EC_KEY from ec.h. +#include <openssl/ec_key.h> + +#if defined(__cplusplus) extern "C++" { BSSL_NAMESPACE_BEGIN |