Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Configure for Apple and guard malloc include #89

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Configure for Apple and guard malloc include #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c97e2
Guard malloc includes for Apple
myshen Feb 5, 2014
b610328
Find CUDA correctly for OS X
myshen Feb 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,19 @@ AC_CONFIG_FILES([

dnl find out what version we are running
ARCH=`uname -m`
OS=`uname`
if [[ $ARCH == "x86_64" ]];
then
SUFFIX="64"
else
SUFFIX=""
fi

if [[ $OS == "Darwin" ]];
then
SUFFIX=""
fi

dnl Setup CUDA paths
AC_ARG_WITH([cuda],
[ --with-cuda=PATH prefix where cuda is installed [default=/usr/local/cuda]])
Expand Down
4 changes: 3 additions & 1 deletion scrypt-jane.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
#define scrypt_maxp 25 /* (1 << 25) = ~33 million */

#include <stdio.h>
#include <malloc.h>
#ifndef __APPLE__
#include <malloc.h>
#endif

// ---------------------------- BEGIN keccak functions ------------------------------------

Expand Down
4 changes: 3 additions & 1 deletion scrypt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ using namespace Concurrency;
#include <string.h>

#include <emmintrin.h>
#include <malloc.h>
#ifndef __APPLE__
#include <malloc.h>
#endif
#include <new>

// A thin wrapper around the builtin __m128i type
Expand Down
4 changes: 3 additions & 1 deletion sha3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

#include <string.h>
#include <stdio.h>
#include <malloc.h>
#ifndef __APPLE__
#include <malloc.h>
#endif

#include "sha3.h"

Expand Down