[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16799] branches/soc-2008-mxcurioni: soc-2008-mxcurioni: merged changes to revision 16795 (final commit)

Maxime Curioni maxime.curioni at gmail.com
Sun Sep 28 22:49:17 CEST 2008


Revision: 16799
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16799
Author:   mxcurioni
Date:     2008-09-28 22:49:16 +0200 (Sun, 28 Sep 2008)

Log Message:
-----------
soc-2008-mxcurioni: merged changes to revision 16795 (final commit)

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16795

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/extern/fftw/kernel/kalloc.c
    branches/soc-2008-mxcurioni/source/blender/include/butspace.h

Modified: branches/soc-2008-mxcurioni/extern/fftw/kernel/kalloc.c
===================================================================
--- branches/soc-2008-mxcurioni/extern/fftw/kernel/kalloc.c	2008-09-28 20:15:52 UTC (rev 16798)
+++ branches/soc-2008-mxcurioni/extern/fftw/kernel/kalloc.c	2008-09-28 20:49:16 UTC (rev 16799)
@@ -26,7 +26,11 @@
 
 #if defined(HAVE_DECL_MEMALIGN) && !HAVE_DECL_MEMALIGN
 #  if defined(HAVE_MALLOC_H)
-#    include <malloc.h>
+	#ifdef __APPLE__
+		#include <malloc/malloc.h>
+	#else
+		#include <malloc.h>
+	#endif
 #  else
 extern void *memalign(size_t, size_t);
 #  endif

Modified: branches/soc-2008-mxcurioni/source/blender/include/butspace.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/include/butspace.h	2008-09-28 20:15:52 UTC (rev 16798)
+++ branches/soc-2008-mxcurioni/source/blender/include/butspace.h	2008-09-28 20:49:16 UTC (rev 16799)
@@ -314,7 +314,7 @@
 
 #define B_FS_PIC		1601
 #define B_FS_BACKBUF	1602
-
+#define B_FS_FRS		1603
 #define B_FS_FTYPE		1604 /* FTYPE is no more */
 #define B_DORENDER		1605
 #define B_DOANIM		1606





More information about the Bf-blender-cvs mailing list