diff options
| -rw-r--r-- | intern/guardedalloc/intern/mmap_win.c | 4 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/fileops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c index c09be8c24a8..3c4607d0d2a 100644 --- a/intern/guardedalloc/intern/mmap_win.c +++ b/intern/guardedalloc/intern/mmap_win.c @@ -86,7 +86,7 @@ volatile static struct mmapListBase *mmapbase = &_mmapbase; /* --------------------------------------------------------------------- */ /* mmap for windows */ -void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset) +void *mmap(void *UNUSED(start), size_t len, int prot, int flags, int fd, off_t offset) { HANDLE fhandle = INVALID_HANDLE_VALUE; HANDLE maphandle; @@ -151,7 +151,7 @@ void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset) } /* munmap for windows */ -intptr_t munmap(void *ptr, intptr_t size) +intptr_t munmap(void *ptr, intptr_t UNUSED(size)) { MemMap *mm = mmap_findlink(mmapbase, ptr); if (!mm) { diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 7a30bcde327..795938b4957 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -218,7 +218,7 @@ int BLI_copy_fileops(const char *file, const char *to) { return err; } -int BLI_link(const char *file, const char *to) { +int BLI_link(const char *UNUSED(file), const char *UNUSED(to)) { callLocalErrorCallBack("Linking files is unsupported on Windows"); return 1; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index da90f353086..224ee06a685 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2526,7 +2526,7 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar) UI_ThemeColor(TH_TEXT_HI); if(v3d->grid != 1.0f) { - BLI_snprintf(tstr, sizeof(tstr), "%s x %.4g", v3d->grid, grid_unit); + BLI_snprintf(tstr, sizeof(tstr), "%s x %.4g", grid_unit, v3d->grid); } BLF_draw_default(22, ar->winy-(USER_SHOW_VIEWPORTNAME?40:20), 0.0f, tstr[0]?tstr : grid_unit, sizeof(tstr)); /* XXX, use real length */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index c83d3277610..74eaeed0ac0 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2041,7 +2041,7 @@ static void WM_OT_quit_blender(wmOperatorType *ot) /* *********************** */ #if defined(WIN32) static int console= 1; -void WM_toggle_console(bContext *C, short show) +void WM_toggle_console(bContext *UNUSED(C), short show) { if(show) { ShowWindow(GetConsoleWindow(),SW_SHOW); @@ -2053,7 +2053,7 @@ void WM_toggle_console(bContext *C, short show) } } -static int wm_toggle_console_op(bContext *C, wmOperator *op) +static int wm_toggle_console_op(bContext *C, wmOperator *UNUSED(op)) { if(console) { WM_toggle_console(C, 0); |