[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34891] trunk/blender/intern/mikktspace/ mikktspace.c: fix from mikes for building on apple with gcc 4.2.1

Campbell Barton ideasman42 at gmail.com
Wed Feb 16 06:03:34 CET 2011


Revision: 34891
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34891
Author:   campbellbarton
Date:     2011-02-16 05:03:33 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
fix from mikes for building on apple with gcc 4.2.1

Modified Paths:
--------------
    trunk/blender/intern/mikktspace/mikktspace.c

Modified: trunk/blender/intern/mikktspace/mikktspace.c
===================================================================
--- trunk/blender/intern/mikktspace/mikktspace.c	2011-02-16 02:51:56 UTC (rev 34890)
+++ trunk/blender/intern/mikktspace/mikktspace.c	2011-02-16 05:03:33 UTC (rev 34891)
@@ -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




More information about the Bf-blender-cvs mailing list