aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-08-29 23:44:13 +0200
committerRiccardo Spagni <ric@spagni.net>2015-08-29 23:44:15 +0200
commitb727efdb3d7bc257b81e13db848496e86446d8ec (patch)
tree7cad0cc051db158cf0de98277cec84b3c104b318 /src
parentMerge pull request #390 (diff)
parentRe-enable optimized slow-hash if someone is trying to compile w/MSVC (disabli... (diff)
downloadmonero-b727efdb3d7bc257b81e13db848496e86446d8ec.tar.xz
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.c2
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