diff options
author | Riccardo Spagni <ric@spagni.net> | 2014-09-11 12:00:30 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2014-09-11 12:00:30 +0200 |
commit | 6a70de32bf872d97f9eebc7564f1ee41ff149c36 (patch) | |
tree | 33c0d997ecfbebe1705142c6e5fe9bd1e5aec278 /src/crypto/tree-hash.c | |
parent | Merge pull request #123 from fluffypony/master (diff) | |
parent | cpu affinity fixes in performance tests for FreeBSD (diff) | |
download | monero-6a70de32bf872d97f9eebc7564f1ee41ff149c36.tar.xz |
Merge pull request #127 from fluffypony/master
FreeBSD compatibility and default log level changes
Diffstat (limited to 'src/crypto/tree-hash.c')
-rw-r--r-- | src/crypto/tree-hash.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/crypto/tree-hash.c b/src/crypto/tree-hash.c index 573f44643..5a84c8688 100644 --- a/src/crypto/tree-hash.c +++ b/src/crypto/tree-hash.c @@ -28,13 +28,18 @@ // // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers -#include <alloca.h> #include <assert.h> #include <stddef.h> #include <string.h> #include "hash-ops.h" +#ifndef __FreeBSD__ + #include <alloca.h> +#else + #include <stdlib.h> +#endif + /// Quick check if this is power of two (use on unsigned types; in this case for size_t only) bool ispowerof2_size_t(size_t x) { return x && !(x & (x - 1)); |