diff options
| author | Adam Langley <agl@google.com> | 2016-07-12 08:03:59 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2016-07-12 08:05:38 -0700 |
| commit | d2b5af56cf2a8b4695821b2ff64a7bfc82f3ba5e (patch) | |
| tree | 63062f50f629f12ec8a9aab1ea18c894e6c0303a /crypto/bio | |
| parent | a125f048c266d8630bc558c3c1315d4fe72664b2 (diff) | |
| download | boringssl-d2b5af56cf2a8b4695821b2ff64a7bfc82f3ba5e.zip boringssl-d2b5af56cf2a8b4695821b2ff64a7bfc82f3ba5e.tar.gz boringssl-d2b5af56cf2a8b4695821b2ff64a7bfc82f3ba5e.tar.bz2 | |
Revert scoped_types.h change.
This reverts commits:
8d79ed67407e433d80ebc8d3aa080e8ce16e6eb7
19fdcb523402ed13ab798cf811fb0119e3e7b104
8d79ed67407e433d80ebc8d3aa080e8ce16e6eb7
Because WebRTC (at least) includes our headers in an extern "C" block,
which precludes having any C++ in them.
Change-Id: Ia849f43795a40034cbd45b22ea680b51aab28b2d
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/bio_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/bio/bio_test.cc b/crypto/bio/bio_test.cc index cd56e62..e7c061e 100644 --- a/crypto/bio/bio_test.cc +++ b/crypto/bio/bio_test.cc @@ -40,6 +40,8 @@ OPENSSL_MSVC_PRAGMA(warning(pop)) #include <algorithm> +#include "../test/scoped_types.h" + namespace bssl { |