Merge pull request #112 from fluffypony/master

fixed OS X malloc.h reference
2014-09-02 12:20:15 +02:00 · 2014-09-02 12:20:15 +02:00 · 1d6372cccf
parent 0c9e3ea913 f8025cada9
commit 1d6372cccf
1 changed files with 4 additions and 1 deletions
--- 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