diff options
| author | fluffypony <ric@spagni.net> | 2014-09-09 12:37:19 +0200 |
|---|---|---|
| committer | fluffypony <ric@spagni.net> | 2014-09-09 12:37:19 +0200 |
| commit | 6afbdd975496535567e2c24777721660ba1b4280 (patch) | |
| tree | d2f78a4e6b3fe6d3493235ecb029638fdd1a03a7 | |
| parent | a few more error messages moved to log level 1 (diff) | |
| download | monero-6afbdd975496535567e2c24777721660ba1b4280.tar.xz | |
FreeBSD alloca.h reference fixed
| -rw-r--r-- | src/crypto/crypto.cpp | 7 | ||||
| -rw-r--r-- | src/crypto/tree-hash.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/crypto/crypto.cpp b/src/crypto/crypto.cpp index bce3b1131..fa0199f20 100644 --- a/src/crypto/crypto.cpp +++ b/src/crypto/crypto.cpp @@ -28,7 +28,6 @@ // // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers -#include <alloca.h> #include <cassert> #include <cstddef> #include <cstdint> @@ -42,6 +41,12 @@ #include "crypto.h" #include "hash.h" +#ifndef __FreeBSD__ + #include <alloca.h> +#else + #include <stdlib.h> +#endif + namespace crypto { using std::abort; 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)); |