aboutsummaryrefslogtreecommitdiff
path: root/src/crypto/crypto.cpp
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2014-09-11 12:00:30 +0200
committerRiccardo Spagni <ric@spagni.net>2014-09-11 12:00:30 +0200
commit6a70de32bf872d97f9eebc7564f1ee41ff149c36 (patch)
tree33c0d997ecfbebe1705142c6e5fe9bd1e5aec278 /src/crypto/crypto.cpp
parentMerge pull request #123 from fluffypony/master (diff)
parentcpu affinity fixes in performance tests for FreeBSD (diff)
downloadmonero-6a70de32bf872d97f9eebc7564f1ee41ff149c36.tar.xz
Merge pull request #127 from fluffypony/master
FreeBSD compatibility and default log level changes
Diffstat (limited to 'src/crypto/crypto.cpp')
-rw-r--r--src/crypto/crypto.cpp7
1 files changed, 6 insertions, 1 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;