diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-02-16 14:19:42 +0100 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-02-16 14:19:42 +0100 |
| commit | ba22928d4bc6516e3b10785fefa6735fafdd62d5 (patch) | |
| tree | dd481d126bb68e950459a2b82cb0ac99f0b4cacf /src/crypto/tree-hash.c | |
| parent | Merge pull request #3175 (diff) | |
| parent | Fixed #if instead of #ifdef (diff) | |
| download | monero-ba22928d4bc6516e3b10785fefa6735fafdd62d5.tar.xz | |
Merge pull request #3180
1dfed567 Fixed #if instead of #ifdef (Matt Little)
7c442453 Support building cncrypto lib with msvc (Matt Little)
Diffstat (limited to 'src/crypto/tree-hash.c')
| -rw-r--r-- | src/crypto/tree-hash.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/crypto/tree-hash.c b/src/crypto/tree-hash.c index 59fd20bf9..e6d6a267c 100644 --- a/src/crypto/tree-hash.c +++ b/src/crypto/tree-hash.c @@ -34,7 +34,9 @@ #include "hash-ops.h" -#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) +#ifdef _MSC_VER +#include <malloc.h> +#elif !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) #include <alloca.h> #else #include <stdlib.h> |