diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-08-29 23:44:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-08-29 23:44:15 +0200 |
| commit | b727efdb3d7bc257b81e13db848496e86446d8ec (patch) | |
| tree | 7cad0cc051db158cf0de98277cec84b3c104b318 /src | |
| parent | a1af0feb06a392b3fa1ed4007ad2dca302b7a633 (diff) | |
| parent | b19456dc6dff8af6b55a9d334d035834eb65c540 (diff) | |
| download | monzero-core-b727efdb3d7bc257b81e13db848496e86446d8ec.tar.gz monzero-core-b727efdb3d7bc257b81e13db848496e86446d8ec.tar.xz monzero-core-b727efdb3d7bc257b81e13db848496e86446d8ec.zip | |
Merge pull request #391
b19456d Re-enable optimized slow-hash if someone is trying to compile w/MSVC (disabling it was unintentional) (Javier Smooth)
Diffstat (limited to 'src')
| -rw-r--r-- | src/crypto/slow-hash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crypto/slow-hash.c b/src/crypto/slow-hash.c index 679edf7f9..2a746de3d 100644 --- a/src/crypto/slow-hash.c +++ b/src/crypto/slow-hash.c @@ -37,7 +37,7 @@ #include "hash-ops.h" #include "oaes_lib.h" -#if defined(__x86_64__) +#if defined(__x86_64__) || (defined(_MSC_VER) && defined(_WIN64)) // Optimised code below, uses x86-specific intrinsics, SSE2, AES-NI // Fall back to more portable code is down at the bottom |