[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60666] trunk/blender: Fix OS X build error in malloc code, and warning in rna.

Brecht Van Lommel brechtvanlommel at pandora.be
Thu Oct 10 17:44:47 CEST 2013


Revision: 60666
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60666
Author:   blendix
Date:     2013-10-10 15:44:47 +0000 (Thu, 10 Oct 2013)
Log Message:
-----------
Fix OS X build error in malloc code, and warning in rna.

Modified Paths:
--------------
    trunk/blender/intern/guardedalloc/intern/mallocn_intern.h
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/intern/guardedalloc/intern/mallocn_intern.h
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn_intern.h	2013-10-10 15:19:41 UTC (rev 60665)
+++ trunk/blender/intern/guardedalloc/intern/mallocn_intern.h	2013-10-10 15:44:47 UTC (rev 60666)
@@ -55,6 +55,7 @@
 #  include <malloc.h>
 #  define HAVE_MALLOC_STATS
 #elif defined(__APPLE__)
+#  include <malloc/malloc.h>
 #  define malloc_usable_size malloc_size
 #elif defined(WIN32)
 #  include <malloc.h>

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-10-10 15:19:41 UTC (rev 60665)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-10-10 15:44:47 UTC (rev 60666)
@@ -940,7 +940,7 @@
 	settings->codecType = quicktime_videocodecType_from_rnatmpvalue(value);
 }
 
-static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bContext *C, PointerRNA *ptr,
+static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(ptr),
                                                                             PropertyRNA *UNUSED(prop), int *free)
 {
 	EnumPropertyItem *item = NULL;
@@ -979,7 +979,7 @@
 	settings->audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value);
 }
 
-static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_audiocodecType_itemf(bContext *C, PointerRNA *ptr,
+static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_audiocodecType_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(ptr),
                                                                                  PropertyRNA *UNUSED(prop), int *free)
 {
 	EnumPropertyItem *item = NULL;




More information about the Bf-blender-cvs mailing list