From ace1c998c42263712bccbce5e2942aecdc8c592e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 24 Apr 2010 10:08:07 +0000 Subject: warning cleanup, also made voxel.c and volumetric.c use BM_INLINE define rather then having their own ifdefs in each file. --- source/blender/editors/armature/editarmature.c | 2 +- source/blender/editors/armature/meshlaplacian.c | 2 +- source/blender/editors/armature/poseobject.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/armature') diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 5e03dcfbefc..504c5b1e3b1 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -88,7 +88,7 @@ #endif /* ************* XXX *************** */ -static int okee() {return 0;} +static int okee(const char *dummy) {return 0;} static void BIF_undo_push(const char *msg) {} /* ************* XXX *************** */ diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index f0f7bc9eb88..1b1448477ea 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -65,7 +65,7 @@ /* ************* XXX *************** */ static void waitcursor(int val) {} -static void progress_bar() {} +static void progress_bar(int dummy_val, const char *dummy) {} static void start_progress_bar() {} static void end_progress_bar() {} static void error(char *str) { printf("error: %s\n", str); } diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 795a27c5642..dcd59a3185a 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -78,9 +78,9 @@ #include "armature_intern.h" /* ************* XXX *************** */ -static int pupmenu() {return 0;} -static void error() {}; -static void BIF_undo_push() {} +static int pupmenu(const char *dummy) {return 0;} +static void error(const char *dummy) {}; +static void BIF_undo_push(const char *dummy) {} /* ************* XXX *************** */ /* This function is used to indicate that a bone is selected and needs keyframes inserted */ -- cgit v1.2.3