quiet various warnings, also disable -Wdouble-promotion with cmake since it gives warnings with variable length args.

7 files changed, 37 insertions, 37 deletions

diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 77757cce61c..37af293e3aa 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -129,7 +129,7 @@ typedef struct IconTexture {
 /* ******************* STATIC LOCAL VARS ******************* */
 /* static here to cache results of icon directory scan, so it's not 
  * scanning the filesystem each time the menu is drawn */
-static struct ListBase iconfilelist = {0, 0};
+static struct ListBase iconfilelist = {NULL, NULL};
 static IconTexture icongltex = {0, 0, 0, 0.0f, 0.0f};
 
 /* **************************************************** */
@@ -144,7 +144,7 @@ static void def_internal_icon(ImBuf *bbuf, int icon_id, int xofs, int yofs, int
 
 	new_icon = MEM_callocN(sizeof(Icon), "texicon");
 
-	new_icon->obj = 0; /* icon is not for library object */
+	new_icon->obj = NULL; /* icon is not for library object */
 	new_icon->type = 0;	
 
 	di = MEM_callocN(sizeof(DrawInfo), "drawinfo");
@@ -184,14 +184,14 @@ static void def_internal_vicon( int icon_id, VectorDrawFunc drawFunc)
 
 	new_icon = MEM_callocN(sizeof(Icon), "texicon");
 
-	new_icon->obj = 0; /* icon is not for library object */
+	new_icon->obj = NULL; /* icon is not for library object */
 	new_icon->type = 0;
 
 	di = MEM_callocN(sizeof(DrawInfo), "drawinfo");
 	di->type= ICON_TYPE_VECTOR;
 	di->data.vector.func =drawFunc;
 
-	new_icon->drawinfo_free = 0;
+	new_icon->drawinfo_free = NULL;
 	new_icon->drawinfo = di;
 
 	BKE_icon_set(icon_id, new_icon);
@@ -667,7 +667,7 @@ static void init_iconfile_list(struct ListBase *list)
 		if (dir[i].string) MEM_freeN(dir[i].string);
 	}
 	free(dir);
-	dir= 0;
+	dir= NULL;
 }
 
 static void free_iconfile_list(struct ListBase *list)
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index c4c30df87ed..4aa9b942cf3 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -809,7 +809,7 @@ static void fluidbake_free_data(FluidAnimChannels *channels, ListBase *fobjects,
 	}
 }
 
-int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain)
+static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain)
 {
 	Scene *scene= CTX_data_scene(C);
 	int i;
diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c
index e07efcadb65..6c3f80cda41 100644
--- a/source/blender/editors/space_action/action_ops.c
+++ b/source/blender/editors/space_action/action_ops.c
@@ -39,8 +39,7 @@
 
 #include "BLI_blenlib.h"
 
-
-
+#include "ED_anim_api.h"
 #include "ED_transform.h"
 
 #include "action_intern.h"
diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c
index e75fbeb8efc..8510446768d 100644
--- a/source/blender/editors/space_graph/graph_ops.c
+++ b/source/blender/editors/space_graph/graph_ops.c
@@ -45,6 +45,7 @@
 
 #include "UI_view2d.h"
 
+#include "ED_anim_api.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
 
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 048581e207e..115d1ad7bae 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -337,7 +337,7 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, short mval[2])
 		}
 		seq= seq->next;
 	}
-	return 0;
+	return NULL;
 }
 
 
@@ -461,12 +461,12 @@ static void reload_image_strip(Scene *scene, char *UNUSED(name))
 
 
 
-	if(last_seq==0 || last_seq->type!=SEQ_IMAGE) return;
+	if(last_seq==NULL || last_seq->type!=SEQ_IMAGE) return;
 	seqact= last_seq;	/* last_seq changes in alloc_sequence */
 
 	/* search sfile */
 //	sfile= scrarea_find_space_of_type(curarea, SPACE_FILE);
-	if(sfile==0) return;
+	if(sfile == NULL) return;
 
 	waitcursor(1);
 
@@ -479,7 +479,7 @@ static void reload_image_strip(Scene *scene, char *UNUSED(name))
 		seqact->len= seq->len;
 		calc_sequence(scene, seqact);
 
-		seq->strip= 0;
+		seq->strip= NULL;
 		seq_free_sequence(scene, seq);
 		BLI_remlink(ed->seqbasep, seq);
 
@@ -497,7 +497,7 @@ static void change_sequence(Scene *scene)
 	Scene *sce;
 	short event;
 
-	if(last_seq==0) return;
+	if(last_seq == NULL) return;
 
 	if(last_seq->type & SEQ_EFFECT) {
 		event = pupmenu("Change Effect%t"
@@ -590,7 +590,7 @@ static void change_sequence(Scene *scene)
 int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequence **selseq1, Sequence **selseq2, Sequence **selseq3, const char **error_str)
 {
 	Editing *ed = seq_give_editing(scene, FALSE);
-	Sequence *seq1= 0, *seq2= 0, *seq3= 0, *seq;
+	Sequence *seq1= NULL, *seq2= NULL, *seq3= NULL, *seq;
 	
 	*error_str= NULL;
 
@@ -604,9 +604,9 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen
 				return 0;
 			}
 			if((seq != activeseq) && (seq != seq2)) {
-								if(seq2==0) seq2= seq;
-								else if(seq1==0) seq1= seq;
-								else if(seq3==0) seq3= seq;
+								if(seq2 == NULL) seq2= seq;
+								else if(seq1 == NULL) seq1= seq;
+								else if(seq3 == NULL) seq3= seq;
 								else {
 									*error_str= "Can't apply effect to more than 3 sequence strips";
 									return 0;
@@ -617,7 +617,7 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen
        
 	/* make sequence selection a little bit more intuitive
 	   for 3 strips: the last-strip should be sequence3 */
-	if (seq3 != 0 && seq2 != 0) {
+	if (seq3 != NULL && seq2 != NULL) {
 		Sequence *tmp = seq2;
 		seq2 = seq3;
 		seq3 = tmp;
@@ -626,21 +626,21 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen
 
 	switch(get_sequence_effect_num_inputs(type)) {
 	case 0:
-		*selseq1 = *selseq2 = *selseq3 = 0;
+		*selseq1 = *selseq2 = *selseq3 = NULL;
 		return 1; /* succsess */
 	case 1:
-		if(seq2==0)  {
+		if(seq2==NULL)  {
 			*error_str= "Need at least one selected sequence strip";
 			return 0;
 		}
-		if(seq1==0) seq1= seq2;
-		if(seq3==0) seq3= seq2;
+		if(seq1==NULL) seq1= seq2;
+		if(seq3==NULL) seq3= seq2;
 	case 2:
-		if(seq1==0 || seq2==0) {
+		if(seq1==NULL || seq2==NULL) {
 			*error_str= "Need 2 selected sequence strips";
 			return 0;
 		}
-		if(seq3==0) seq3= seq2;
+		if(seq3 == NULL) seq3= seq2;
 	}
 	
 	if (seq1==NULL && seq2==NULL && seq3==NULL) {
@@ -722,7 +722,7 @@ static void recurs_del_seq_flag(Scene *scene, ListBase *lb, short flag, short de
 static Sequence *cut_seq_hard(Scene *scene, Sequence * seq, int cutframe)
 {
 	TransSeq ts;
-	Sequence *seqn = 0;
+	Sequence *seqn = NULL;
 	int skip_dup = FALSE;
 
 	/* backup values */
@@ -816,7 +816,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence * seq, int cutframe)
 static Sequence *cut_seq_soft(Scene *scene, Sequence * seq, int cutframe)
 {
 	TransSeq ts;
-	Sequence *seqn = 0;
+	Sequence *seqn = NULL;
 	int skip_dup = FALSE;
 
 	/* backup values */
@@ -2013,8 +2013,8 @@ static int sequencer_meta_separate_exec(bContext *C, wmOperator *UNUSED(op))
 
 	BLI_movelisttolist(ed->seqbasep, &last_seq->seqbase);
 
-	last_seq->seqbase.first= 0;
-	last_seq->seqbase.last= 0;
+	last_seq->seqbase.first= NULL;
+	last_seq->seqbase.last= NULL;
 
 	BLI_remlink(ed->seqbasep, last_seq);
 	seq_free_sequence(scene, last_seq);
diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c
index 49ad1e2825c..b617d012237 100644
--- a/source/blender/editors/space_sequencer/sequencer_scopes.c
+++ b/source/blender/editors/space_sequencer/sequencer_scopes.c
@@ -167,7 +167,7 @@ static struct ImBuf *make_waveform_view_from_ibuf_byte(struct ImBuf * ibuf)
 	}
 
 	for (y = 0; y < ibuf->y; y++) {
-		unsigned char * last_p = 0;
+		unsigned char * last_p = NULL;
 
 		for (x = 0; x < ibuf->x; x++) {
 			unsigned char * rgb = src + 4 * (ibuf->x * y + x);
@@ -182,7 +182,7 @@ static struct ImBuf *make_waveform_view_from_ibuf_byte(struct ImBuf * ibuf)
 			p += 4 * w;
 			scope_put_pixel(wtable, p);
 
-			if (last_p != 0) {
+			if (last_p != NULL) {
 				wform_put_line(w, last_p, p);
 			}
 			last_p = p;
@@ -213,7 +213,7 @@ static struct ImBuf *make_waveform_view_from_ibuf_float(struct ImBuf * ibuf)
 	}
 
 	for (y = 0; y < ibuf->y; y++) {
-		unsigned char * last_p = 0;
+		unsigned char * last_p = NULL;
 
 		for (x = 0; x < ibuf->x; x++) {
 			float * rgb = src + 4 * (ibuf->x * y + x);
@@ -231,7 +231,7 @@ static struct ImBuf *make_waveform_view_from_ibuf_float(struct ImBuf * ibuf)
 			p += 4 * w;
 			scope_put_pixel(wtable, p);
 
-			if (last_p != 0) {
+			if (last_p != NULL) {
 				wform_put_line(w, last_p, p);
 			}
 			last_p = p;
@@ -274,7 +274,7 @@ static struct ImBuf *make_sep_waveform_view_from_ibuf_byte(struct ImBuf * ibuf)
 	}
 
 	for (y = 0; y < ibuf->y; y++) {
-		unsigned char * last_p[3] = {0,0,0};
+		unsigned char *last_p[3] = {NULL, NULL, NULL};
 
 		for (x = 0; x < ibuf->x; x++) {
 			int c;
@@ -288,7 +288,7 @@ static struct ImBuf *make_sep_waveform_view_from_ibuf_byte(struct ImBuf * ibuf)
 				p += 4 * w;
 				scope_put_pixel_single(wtable, p, c);
 
-				if (last_p[c] != 0) {
+				if (last_p[c] != NULL) {
 					wform_put_line_single(
 						w, last_p[c], p, c);
 				}
@@ -324,7 +324,7 @@ static struct ImBuf *make_sep_waveform_view_from_ibuf_float(
 	}
 
 	for (y = 0; y < ibuf->y; y++) {
-		unsigned char * last_p[3] = {0, 0, 0};
+		unsigned char *last_p[3] = {NULL, NULL, NULL};
 
 		for (x = 0; x < ibuf->x; x++) {
 			int c;
@@ -342,7 +342,7 @@ static struct ImBuf *make_sep_waveform_view_from_ibuf_float(
 				p += 4 * w;
 				scope_put_pixel_single(wtable, p, c);
 
-				if (last_p[c] != 0) {
+				if (last_p[c] != NULL) {
 					wform_put_line_single(
 						w, last_p[c], p, c);
 				}
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index d6ed9752d03..8f8b46d07ad 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1696,7 +1696,7 @@ static void RestoreState(bContext *C, wmWindow *win)
 }
 
 /* was space_set_commmandline_options in 2.4x */
-void game_set_commmandline_options(GameData *gm)
+static void game_set_commmandline_options(GameData *gm)
 {
 	SYS_SystemHandle syshandle;
 	int test;