Remove a clang-cl workaround that's no longer needed.

clang-cl now supports enough of `#pragma intrinsic` that
it can use SecureZeroMemory() without an explicit intrin.h include.
This reverts https://boringssl-review.googlesource.com/#/c/8320/

BUG=chromium:592745

Change-Id: Ib766133f1713137bddd07654376a3b4888d4b0fb
Reviewed-on: https://boringssl-review.googlesource.com/11780
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
Nico Weber 2016-10-25 16:49:33 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent c6722cd6e0
commit 351af19bb0

View File

@ -68,14 +68,6 @@
#if defined(OPENSSL_WINDOWS) #if defined(OPENSSL_WINDOWS)
OPENSSL_MSVC_PRAGMA(warning(push, 3)) OPENSSL_MSVC_PRAGMA(warning(push, 3))
#include <windows.h> #include <windows.h>
/* Work around a clang-cl bug: SecureZeroMemory() below uses __stosb() but
* windows.h only declares that intrinsic and then uses `#pragma intrinsic` for
* it. clang-cl doesn't implement `#pragma intrinsic` yet; it instead defines
* the function as an always-inline symbol in its intrin.h.
* TODO(thakis): Remove this once http://llvm.org/PR19898 is fixed.
*/
#include <intrin.h>
OPENSSL_MSVC_PRAGMA(warning(pop)) OPENSSL_MSVC_PRAGMA(warning(pop))
#else #else
#include <strings.h> #include <strings.h>