diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-10 19:44:47 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-10 19:44:47 +0400 |
| commit | b880b01db5a6ff4dd7704c08bd2a7afc1654f8a1 (patch) | |
| tree | 14226adfed0de534b7d0586aead6e3a037a95920 | |
| parent | 180de82e4160f84a13b1d2e20ec7f6c9cad91383 (diff) | |
Fix OS X build error in malloc code, and warning in rna.
| -rw-r--r-- | intern/guardedalloc/intern/mallocn_intern.h | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h index cf77ce60e0a..29de1af3b8d 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -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> diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 738ccb50c47..b59c7b821aa 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -940,7 +940,7 @@ static void rna_RenderSettings_qtcodecsettings_codecType_set(PointerRNA *ptr, in 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 @@ static void rna_RenderSettings_qtcodecsettings_audiocodecType_set(PointerRNA *pt 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; |