diff options
| author | Brian Smith <brian@briansmith.org> | 2015-01-29 07:34:47 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-01-29 21:48:57 +0300 |
| commit | a87de9b39b5a9b1d6e9ed6d18167946397581df1 (patch) | |
| tree | 8571d6241052d101307fbf3aa65d252e2675d421 /tool/speed.cc | |
| parent | 4a0f0c4910e20705282166da10943d6eed5a0d66 (diff) | |
Define WIN32_LEAN_AND_MEAN in the build system, not in the code.
This avoids a conflict with the Chromium build system, which
defines WIN32_LEAN_AND_MEAN with a different value.
BUG=crbug.com/453196
Change-Id: Ia15ec7c20325c1961af4f32e5208266e5f846f35
Reviewed-on: https://boringssl-review.googlesource.com/3150
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'tool/speed.cc')
| -rw-r--r-- | tool/speed.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tool/speed.cc b/tool/speed.cc index 8184339e..cfffcb05 100644 --- a/tool/speed.cc +++ b/tool/speed.cc @@ -27,7 +27,6 @@ #include <openssl/rsa.h> #if defined(OPENSSL_WINDOWS) -#define WIN32_LEAN_AND_MEAN #include <Windows.h> #elif defined(OPENSSL_APPLE) #include <sys/time.h> |