diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-09-02 12:20:15 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-09-02 12:20:15 +0200 |
| commit | 1d6372cccf87d674b24c5d389c9214096dab4c07 (patch) | |
| tree | 3c69bfe31de4b6e87973890d8bce5396897a48ca | |
| parent | Merge pull request #109 from fluffypony/master (diff) | |
| parent | fixed OS X malloc.h reference (diff) | |
| download | monero-1d6372cccf87d674b24c5d389c9214096dab4c07.tar.xz | |
Merge pull request #112 from fluffypony/master
fixed OS X malloc.h reference
| -rw-r--r-- | src/crypto/oaes_lib.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/crypto/oaes_lib.c b/src/crypto/oaes_lib.c index f3f2aac8c..81c8aeff2 100644 --- a/src/crypto/oaes_lib.c +++ b/src/crypto/oaes_lib.c @@ -34,11 +34,14 @@ static const char _NR[] = { #include <stddef.h> #include <time.h> #include <sys/timeb.h> -#include <malloc.h> #include <string.h> #include <stdlib.h> #include <stdio.h> +#ifndef __APPLE__ +#include <malloc.h> +#endif + #ifdef WIN32 #include <process.h> #else |