diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-16 08:03:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-16 08:03:33 +0300 |
| commit | 85edbd5f8d53b5b90a4d9b85ac77b1938742e516 (patch) | |
| tree | 72aafb2b7d4f3eb71393d2b07241e02003f03a87 /intern/mikktspace | |
| parent | 4c35d8d5a810f3190315b641610e2a55c54c3b51 (diff) | |
fix from mikes for building on apple with gcc 4.2.1
Diffstat (limited to 'intern/mikktspace')
| -rw-r--r-- | intern/mikktspace/mikktspace.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c index 125725a44ff..797064a21f6 100644 --- a/intern/mikktspace/mikktspace.c +++ b/intern/mikktspace/mikktspace.c @@ -23,7 +23,13 @@ #include <math.h> #include <string.h> #include <float.h> -#include <malloc.h> + +#ifdef __APPLE__ +#include <stdlib.h> /* OSX gets its malloc stuff through here */ +#else +#include <malloc.h> +#endif + #include "mikktspace.h" #define TFALSE 0 |