aboutsummaryrefslogtreecommitdiff
path: root/src/crypto/crypto.cpp
diff options
context:
space:
mode:
authorjebes <psteidelprogramming@gmail.com>2014-09-11 10:20:55 -0400
committerjebes <psteidelprogramming@gmail.com>2014-09-11 10:20:55 -0400
commitdfed3d39b6607508f75bc8d79e64c3e742dee155 (patch)
tree549a4bfa8b7b902cd5f87db8d90a6b6051aee786 /src/crypto/crypto.cpp
parentHOW DO I GIT? (diff)
parentMerge pull request #128 from fluffypony/master (diff)
downloadmonero-dfed3d39b6607508f75bc8d79e64c3e742dee155.tar.xz
Merge remote-tracking branch 'upstream/master'
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;