fix for some pedantic warnings.

intern/guardedalloc/intern/mallocn.c

@@ -502,7 +502,7 @@ static void MEM_printmemlist_internal( int pydict )
 	}
 	while(membl) {
 		if (pydict) {
-			fprintf(stderr, "{'len':" SIZET_FORMAT ", 'name':'''%s''', 'pointer':'%p'},\\\n", SIZET_ARG(membl->len), membl->name, membl+1);
+			fprintf(stderr, "{'len':" SIZET_FORMAT ", 'name':'''%s''', 'pointer':'%p'},\\\n", SIZET_ARG(membl->len), membl->name, (void *)(membl+1));
 		} else {
 #ifdef DEBUG_MEMCOUNTER
 			print_error("%s len: " SIZET_FORMAT " %p, count: %d\n", membl->name, SIZET_ARG(membl->len), membl+1, membl->_count);

release/datafiles/datatoc.py

@@ -45,8 +45,8 @@ fpin.seek(0, os.SEEK_END)
 size = fpin.tell()
 fpin.seek(0)
 
-if filename[0] == ".":
+if filename[0:2] == "." + os.sep:
-    filename = filename[1:]
+    filename = filename[2:]
 
 cname = filename + ".c"
 sys.stdout.write("Making C file <%s>\n" % cname)

source/blender/blenkernel/BKE_deform.h

@@ -49,8 +49,8 @@ int					 defgroup_flip_index(struct Object *ob, int index, int use_default);
 int					 defgroup_name_index(struct Object *ob, const char *name);
 void				 defgroup_unique_name(struct bDeformGroup *dg, struct Object *ob);
 
-struct MDeformWeight	*defvert_find_index(const struct MDeformVert *dv, int defgroup);
+struct MDeformWeight	*defvert_find_index(const struct MDeformVert *dv, const int defgroup);
-struct MDeformWeight	*defvert_verify_index(struct MDeformVert *dv, int defgroup);
+struct MDeformWeight	*defvert_verify_index(struct MDeformVert *dv, const int defgroup);
 
 float  defvert_find_weight(const struct MDeformVert *dvert, int group_num);
 float  defvert_array_find_weight_safe(const struct MDeformVert *dvert, int index, int group_num);

source/blender/blenkernel/BKE_fcurve.h

@@ -140,7 +140,7 @@ typedef enum eFMI_Action_Types {
 		/* modifier only modifies the values of points (but times stay the same) */
 	FMI_TYPE_REPLACE_VALUES,
 		/* modifier generates a curve regardless of what came before */
-	FMI_TYPE_GENERATE_CURVE,
+	FMI_TYPE_GENERATE_CURVE
 } eFMI_Action_Types;
 
 /* Flags for the requirements of a FModifier Type */
@@ -152,7 +152,7 @@ typedef enum eFMI_Requirement_Flags {
 		 */
 	FMI_REQUIRES_NOTHING			= (1<<1),
 		/* refer to modifier instance */
-	FMI_REQUIRES_RUNTIME_CHECK		= (1<<2),
+	FMI_REQUIRES_RUNTIME_CHECK		= (1<<2)
 } eFMI_Requirement_Flags;
 
 /* Function Prototypes for FModifierTypeInfo's */

source/blender/blenkernel/intern/deform.c

@@ -463,7 +463,7 @@ float defvert_array_find_weight_safe(const struct MDeformVert *dvert, int index,
 }
 
 
-MDeformWeight *defvert_find_index(const MDeformVert *dvert, int defgroup)
+MDeformWeight *defvert_find_index(const MDeformVert *dvert, const int defgroup)
 {
 	if(dvert && defgroup >= 0) {
 		MDeformWeight *dw = dvert->dw;
@@ -479,7 +479,7 @@ MDeformWeight *defvert_find_index(const MDeformVert *dvert, int defgroup)
 
 /* Ensures that mv has a deform weight entry for the specified defweight group */
 /* Note this function is mirrored in editmesh_tools.c, for use for editvertices */
-MDeformWeight *defvert_verify_index(MDeformVert *dv, int defgroup)
+MDeformWeight *defvert_verify_index(MDeformVert *dv, const int defgroup)
 {
 	MDeformWeight *newdw;
 

source/blender/blenkernel/intern/pointcache.c

@@ -652,6 +652,7 @@ static int ptcache_totpoint_smoke(void *smoke_v, int UNUSED(cfra))
 }
 
 /* Smoke functions */
+#if 0
 static int ptcache_totpoint_smoke_turbulence(void *smoke_v, int UNUSED(cfra))
 {
 	SmokeModifierData *smd= (SmokeModifierData *)smoke_v;
@@ -663,6 +664,7 @@ static int ptcache_totpoint_smoke_turbulence(void *smoke_v, int UNUSED(cfra))
 	else
 		return 0;
 }
+#endif
 
 // forward decleration
 static int ptcache_file_write(PTCacheFile *pf, void *f, size_t tot, int size);

source/blender/blenkernel/intern/smoke.c

@@ -110,6 +110,8 @@ static void tend ( void )
 {
 	gettimeofday ( &_tend,&tz );
 }
+
+#if 0 // unused
 static double tval()
 {
 	double t1, t2;
@@ -118,6 +120,7 @@ static double tval()
 	return t2-t1;
 }
 #endif
+#endif
 
 struct Object;
 struct Scene;

source/blender/blenlib/BLI_math_rotation.h

@@ -131,7 +131,7 @@ typedef enum eEulerRotationOrders {
 	EULER_ORDER_YXZ,
 	EULER_ORDER_YZX,
 	EULER_ORDER_ZXY,
-	EULER_ORDER_ZYX,
+	EULER_ORDER_ZYX
 	/* there are 6 more entries with dulpicate entries included */
 } eEulerRotationOrders;
 

source/blender/blenlib/intern/graph.c

@@ -128,7 +128,7 @@ void BLI_buildAdjacencyList(BGraph *graph)
 	{
 		if (node->degree != node->flag)
 		{
-			printf("error in node [%p]. Added only %i arcs out of %i\n", node, node->flag, node->degree);
+			printf("error in node [%p]. Added only %i arcs out of %i\n", (void *)node, node->flag, node->degree);
 		}
 	}
 }
@@ -161,7 +161,7 @@ void BLI_rebuildAdjacencyListForNode(BGraph* graph, BNode *node)
 
 	if (node->degree != node->flag)
 	{
-		printf("error in node [%p]. Added only %i arcs out of %i\n", node, node->flag, node->degree);
+		printf("error in node [%p]. Added only %i arcs out of %i\n", (void *)node, node->flag, node->degree);
 	}
 }
 

source/blender/blenlib/intern/scanfill.c

@@ -360,7 +360,7 @@ static ScFillVert *addedgetoscanlist(EditEdge *eed, int len)
 	sc= (ScFillVert *)bsearch(&scsearch,scdata,len,
 		sizeof(ScFillVert), vergscdata);
 
-	if(sc==0) printf("Error in search edge: %p\n",eed);
+	if(sc==0) printf("Error in search edge: %p\n", (void *)eed);
 	else if(addedgetoscanvert(sc,eed)==0) return sc;
 
 	return 0;

source/blender/editors/animation/anim_filter.c

@@ -2048,7 +2048,7 @@ static int animdata_filter_dopesheet (bAnimContext *ac, ListBase *anim_data, bDo
 	if ((ads->source == NULL) || (GS(ads->source->name)!=ID_SCE)) {
 		printf("DopeSheet Error: Not scene!\n");
 		if (G.f & G_DEBUG)
-			printf("\tPointer = %p, Name = '%s' \n", ads->source, (ads->source)?ads->source->name:NULL);
+			printf("\tPointer = %p, Name = '%s' \n", (void *)ads->source, (ads->source)?ads->source->name:NULL);
 		return 0;
 	}
 	

source/blender/editors/animation/keyframing.c

@@ -1401,7 +1401,7 @@ static int insert_key_button_exec (bContext *C, wmOperator *op)
 		}
 	}
 	else if (G.f & G_DEBUG) {
-		printf("ptr.data = %p, prop = %p,", ptr.data, prop);
+		printf("ptr.data = %p, prop = %p,", (void *)ptr.data, (void *)prop);
 		if(prop)
 			printf("animateable = %d \n", RNA_property_animateable(&ptr, prop));
 		else
@@ -1476,7 +1476,7 @@ static int delete_key_button_exec (bContext *C, wmOperator *op)
 			printf("Button Delete-Key: no path to property \n");
 	}
 	else if (G.f & G_DEBUG) {
-		printf("ptr.data = %p, prop = %p \n", ptr.data, prop);
+		printf("ptr.data = %p, prop = %p \n", (void *)ptr.data, (void *)prop);
 	}
 	
 	

source/blender/editors/armature/editarmature_retarget.c

@@ -1415,7 +1415,7 @@ static void RIG_findHead(RigGraph *rg)
 
 void RIG_printNode(RigNode *node, char name[])
 {
-	printf("%s %p %i <%0.3f, %0.3f, %0.3f>\n", name, node, node->degree, node->p[0], node->p[1], node->p[2]);
+	printf("%s %p %i <%0.3f, %0.3f, %0.3f>\n", name, (void *)node, node->degree, node->p[0], node->p[1], node->p[2]);
 	
 	if (node->symmetry_flag & SYM_TOPOLOGICAL)
 	{

source/blender/editors/armature/poseobject.c

@@ -72,7 +72,7 @@
 
 /* ************* XXX *************** */
 static int pupmenu(const char *UNUSED(dummy)) {return 0;}
-static void error(const char *UNUSED(dummy)) {};
+static void error(const char *UNUSED(dummy)) {}
 static void BIF_undo_push(const char *UNUSED(dummy)) {}
 /* ************* XXX *************** */
 

source/blender/editors/armature/reeb.c

@@ -603,7 +603,7 @@ void verifyMultiResolutionLinks(ReebGraph *rg, int level)
 		{
 			if (BLI_findindex(&lower_rg->arcs, arc->link_up) == -1)
 			{
-				printf("missing arc %p for level %i\n", arc->link_up, level);
+				printf("missing arc %p for level %i\n", (void *)arc->link_up, level);
 				printf("Source arc was ---\n");
 				printArc(arc);
 

source/blender/editors/curve/curve_intern.h

@@ -33,7 +33,7 @@
 struct wmOperatorType;
 
 /* lorem.c */
-extern char *ED_lorem;
+extern const char ED_lorem[];
 
 /* editfont.c */
 enum { DEL_ALL, DEL_NEXT_CHAR, DEL_PREV_CHAR, DEL_SELECTION, DEL_NEXT_SEL, DEL_PREV_SEL };

source/blender/editors/curve/editcurve.c

@@ -701,7 +701,7 @@ static void calc_keyHandles(ListBase *nurb, float *key)
 				}
 				else {
 					++nextp;
-					nextfp += 12;;
+					nextfp += 12;
 				}
 
 				++bezt;

source/blender/editors/curve/editfont.c

@@ -274,9 +274,9 @@ static void text_update_edited(bContext *C, Scene *scene, Object *obedit, int re
 static int insert_lorem_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *obedit= CTX_data_edit_object(C);
-	char *p, *p2;
+	const char *p, *p2;
 	int i;
-	static char *lastlorem;
+	static const char *lastlorem;
 	
 	if(lastlorem)
 		p= lastlorem;

source/blender/editors/include/ED_anim_api.h

@@ -88,7 +88,7 @@ typedef enum eAnimCont_Types {
 	ANIMCONT_DOPESHEET,		/* dopesheet (bDopesheet) */
 	ANIMCONT_FCURVES,		/* animation F-Curves (bDopesheet) */
 	ANIMCONT_DRIVERS,		/* drivers (bDopesheet) */
-	ANIMCONT_NLA,			/* nla (bDopesheet) */
+	ANIMCONT_NLA			/* nla (bDopesheet) */
 } eAnimCont_Types;
 
 /* --------------- Channels -------------------- */
@@ -163,7 +163,7 @@ typedef enum eAnim_ChannelType {
 	ANIMTYPE_NLAACTION,
 	
 		/* always as last item, the total number of channel types... */
-	ANIMTYPE_NUM_TYPES,
+	ANIMTYPE_NUM_TYPES
 } eAnim_ChannelType;
 
 /* types of keyframe data in bAnimListElem */
@@ -177,7 +177,7 @@ typedef enum eAnim_KeyType {
 	ALE_SCE,			/* Scene summary */
 	ALE_OB,				/* Object summary */
 	ALE_ACT,			/* Action summary */
-	ALE_GROUP,			/* Action Group summary */
+	ALE_GROUP			/* Action Group summary */
 } eAnim_KeyType;
 
 /* ----------------- Filtering -------------------- */
@@ -327,7 +327,7 @@ typedef enum eAnimChannels_SetFlag {
 	ACHANNEL_SETFLAG_CLEAR = 0,		/* turn off */
 	ACHANNEL_SETFLAG_ADD,			/* turn on */
 	ACHANNEL_SETFLAG_INVERT,		/* on->off, off->on */
-	ACHANNEL_SETFLAG_TOGGLE,		/* some on -> all off // all on */
+	ACHANNEL_SETFLAG_TOGGLE			/* some on -> all off // all on */
 } eAnimChannels_SetFlag;
 
 /* types of settings for AnimChannels */
@@ -337,7 +337,7 @@ typedef enum eAnimChannel_Settings {
 	ACHANNEL_SETTING_MUTE,
 	ACHANNEL_SETTING_EXPAND,
 	ACHANNEL_SETTING_VISIBLE,			/* only for Graph Editor */
-	ACHANNEL_SETTING_SOLO,				/* only for NLA Tracks */
+	ACHANNEL_SETTING_SOLO				/* only for NLA Tracks */
 } eAnimChannel_Settings;
 
 
@@ -444,7 +444,7 @@ enum {
 		/* time indication in seconds or frames */
 	DRAWCFRA_UNIT_SECONDS 	= (1<<1),
 		/* show time-offset line */
-	DRAWCFRA_SHOW_TIMEOFS	= (1<<2),
+	DRAWCFRA_SHOW_TIMEOFS	= (1<<2)
 } eAnimEditDraw_CurrentFrame; 
 
 /* main call to draw current-frame indicator in an Animation Editor */
@@ -519,7 +519,7 @@ typedef enum eAnimUnitConv_Flags {
 		/* only touch selected BezTriples */
 	ANIM_UNITCONV_ONLYSEL	= (1<<2),
 		/* only touch selected vertices */
-	ANIM_UNITCONV_SELVERTS	= (1<<3),
+	ANIM_UNITCONV_SELVERTS	= (1<<3)
 } eAnimUnitConv_Flags;
 
 /* Get unit conversion factor for given ID + F-Curve */

source/blender/editors/include/ED_curve.h

@@ -65,7 +65,7 @@ int 	mouse_nurb		(struct bContext *C, short mval[2], int extend);
 
 struct Nurb *add_nurbs_primitive(struct bContext *C, float mat[4][4], int type, int newob);
 
-int		isNurbsel		(struct Nurb *nu);;
+int		isNurbsel		(struct Nurb *nu);
 
 int		join_curve_exec	(struct bContext *C, struct wmOperator *op);
 

source/blender/editors/include/ED_keyframes_edit.h

@@ -53,7 +53,7 @@ typedef enum eEditKeyframes_Validate {
 	BEZT_OK_SELECTED,
 	BEZT_OK_VALUE,
 	BEZT_OK_VALUERANGE,
-	BEZT_OK_REGION,
+	BEZT_OK_REGION
 } eEditKeyframes_Validate;
 
 /* ------------ */
@@ -67,13 +67,13 @@ typedef enum eEditKeyframes_Select {
 		/* remove ok keyframes from selection */
 	SELECT_SUBTRACT	= 	(1<<2),
 		/* flip ok status of keyframes based on key status */
-	SELECT_INVERT	= 	(1<<3),
+	SELECT_INVERT	= 	(1<<3)
 } eEditKeyframes_Select;
 
 /* "selection map" building modes */
 typedef enum eEditKeyframes_SelMap {
 	SELMAP_MORE	= 0,
-	SELMAP_LESS,
+	SELMAP_LESS
 } eEditKeyframes_SelMap;
 
 /* snapping tools */
@@ -83,7 +83,7 @@ typedef enum eEditKeyframes_Snap {
 	SNAP_KEYS_NEARSEC,
 	SNAP_KEYS_NEARMARKER,
 	SNAP_KEYS_HORIZONTAL,
-	SNAP_KEYS_VALUE,
+	SNAP_KEYS_VALUE
 } eEditKeyframes_Snap;
 
 /* mirroring tools */
@@ -92,7 +92,7 @@ typedef enum eEditKeyframes_Mirror {
 	MIRROR_KEYS_YAXIS,
 	MIRROR_KEYS_XAXIS,
 	MIRROR_KEYS_MARKER,
-	MIRROR_KEYS_VALUE,
+	MIRROR_KEYS_VALUE
 } eEditKeyframes_Mirror;
 
 /* ************************************************ */

source/blender/editors/include/UI_interface.h

@@ -338,7 +338,7 @@ enum {
 	UI_BLOCK_BOUNDS_TEXT,
 	UI_BLOCK_BOUNDS_POPUP_MOUSE,
 	UI_BLOCK_BOUNDS_POPUP_MENU,
-	UI_BLOCK_BOUNDS_POPUP_CENTER,
+	UI_BLOCK_BOUNDS_POPUP_CENTER
 } eBlockBoundsCalc;
 
 void uiBoundsBlock(struct uiBlock *block, int addval);

source/blender/editors/include/UI_view2d.h

@@ -57,7 +57,7 @@ enum {
 		/* headers (this is basically the same as listview, but no y-panning) */
 	V2D_COMMONVIEW_HEADER,
 		/* ui region containing panels */
-	V2D_COMMONVIEW_PANELS_UI,
+	V2D_COMMONVIEW_PANELS_UI
 } eView2D_CommonViewTypes;
 
 /* ---- Defines for Scroller/Grid Arguments ----- */
@@ -76,13 +76,13 @@ enum {
 	V2D_UNIT_VALUES,
 	V2D_UNIT_DEGREES,
 	V2D_UNIT_TIME,
-	V2D_UNIT_SECONDSSEQ,
+	V2D_UNIT_SECONDSSEQ
 } eView2D_Units;
 
 /* clamping of grid values to whole numbers */
 enum {
 	V2D_GRID_NOCLAMP = 0,
-	V2D_GRID_CLAMP,
+	V2D_GRID_CLAMP
 } eView2D_Clamp;
 
 /* flags for grid-lines to draw */

source/blender/editors/interface/view2d.c

@@ -849,7 +849,7 @@ void UI_view2d_totRect_set_resize (View2D *v2d, int width, int height, int resiz
 	
 	if (ELEM3(0, v2d, width, height)) {
 		if (G.f & G_DEBUG)
-			printf("Error: View2D totRect set exiting: v2d=%p width=%d height=%d \n", v2d, width, height); // XXX temp debug info
+			printf("Error: View2D totRect set exiting: v2d=%p width=%d height=%d \n", (void *)v2d, width, height); // XXX temp debug info
 		return;
 	}
 	

source/blender/editors/mesh/editface.c

@@ -87,7 +87,7 @@ void paintface_flush_flags(Object *ob)
 	
 	for (i= 0; i<totface; i++, mf++) { /* loop over derived mesh faces */
 		mf_orig= me->mface + index_array[i];
-		mf->flag= mf_orig->flag;;
+		mf->flag= mf_orig->flag;
 	}
 }
 

source/blender/editors/mesh/editmesh_loop.c

@@ -632,7 +632,7 @@ static int knife_cut_exec(bContext *C, wmOperator *op)
 	if (EM_nvertices_selected(em) < 2) {
 		error("No edges are selected to operate on");
 		BKE_mesh_end_editmesh(obedit->data, em);
-		return OPERATOR_CANCELLED;;
+		return OPERATOR_CANCELLED;
 	}
 
 	/* get the cut curve */

source/blender/editors/object/object_relations.c

@@ -1758,7 +1758,7 @@ static int make_local_exec(bContext *C, wmOperator *op)
 	Material *ma, ***matarar;
 	Lamp *la;
 	ID *id;
-	int a, b, mode= RNA_enum_get(op->ptr, "type");;
+	int a, b, mode= RNA_enum_get(op->ptr, "type");
 	
 	if(mode==3) {
 		all_local(NULL, 0);	/* NULL is all libs */

source/blender/editors/render/render_preview.c

@@ -495,8 +495,8 @@ static int ed_preview_draw_rect(ScrArea *sa, Scene *sce, ID *id, int split, int
 		if (sce) gamma_correct = sce->r.color_mgt_flag & R_COLOR_MANAGEMENT;
 	}
 
-	if(!split || first) sprintf(name, "Preview %p", sa);
+	if(!split || first) sprintf(name, "Preview %p", (void *)sa);
-	else sprintf(name, "SecondPreview %p", sa);
+	else sprintf(name, "SecondPreview %p", (void *)sa);
 
 	if(split) {
 		if(first) {
@@ -736,7 +736,7 @@ void BIF_view3d_previewrender(Main *bmain, Scene *scene, ScrArea *sa)
 		
 		ri->status= 0;
 		
-		sprintf(name, "View3dPreview %p", sa);
+		sprintf(name, "View3dPreview %p", (void *)sa);
 		re= ri->re= RE_NewRender(name);
 		//RE_display_draw_cb(re, view3d_previewrender_progress);
 		//RE_stats_draw_cb(re, view3d_previewrender_stats);

source/blender/editors/sculpt_paint/paint_vertex.c

@@ -1511,10 +1511,10 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P
 			if(mface->v4) (me->dvert+mface->v4)->flag= 1;
 					
 			if(brush->vertexpaint_tool==VP_BLUR) {
-				MDeformWeight *dw, *(*dw_func)(MDeformVert *, int);
+				MDeformWeight *dw, *(*dw_func)(MDeformVert *, const int);
 						
 				if(wp->flag & VP_ONLYVGROUP)
-					dw_func= (void *)defvert_find_index; /* uses a const, cast to quiet warning */
+					dw_func= (MDeformWeight *(*)(MDeformVert *, const int))defvert_find_index;
 				else
 					dw_func= defvert_verify_index;
 						

source/blender/editors/space_action/action_select.c

@@ -414,7 +414,7 @@ static void columnselect_action_keys (bAnimContext *ac, short mode)
 	Scene *scene= ac->scene;
 	CfraElem *ce;
 	KeyframeEditFunc select_cb, ok_cb;
-	KeyframeEditData ked= {{0}};;
+	KeyframeEditData ked= {{0}};
 	
 	/* initialise keyframe editing data */
 	

source/blender/editors/space_file/file_draw.c

@@ -135,7 +135,7 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
 	ARegion*		  artmp;
 	
 	/* Initialize UI block. */
-	sprintf(name, "win %p", ar);
+	sprintf(name, "win %p", (void *)ar);
 	block = uiBeginBlock(C, ar, name, UI_EMBOSS);
 	uiBlockSetHandleFunc(block, do_file_buttons, NULL);
 

source/blender/editors/space_logic/logic_window.c

@@ -4416,7 +4416,7 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
 	RNA_pointer_create(NULL, &RNA_SpaceLogicEditor, slogic, &logic_ptr);
 	idar= get_selected_and_linked_obs(C, &count, slogic->scaflag);
 	
-	sprintf(name, "buttonswin %p", ar);
+	sprintf(name, "buttonswin %p", (void *)ar);
 	block= uiBeginBlock(C, ar, name, UI_EMBOSS);
 	uiBlockSetHandleFunc(block, do_logic_buts, NULL);
 	
@@ -4734,7 +4734,7 @@ void logic_buttons(bContext *C, ARegion *ar)
 	if(ob==NULL) return;
 //	uiSetButLock(object_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
 
-	sprintf(name, "buttonswin %p", ar);
+	sprintf(name, "buttonswin %p", (void *)ar);
 	block= uiBeginBlock(C, ar, name, UI_EMBOSS);
 	uiBlockSetHandleFunc(block, do_logic_buts, NULL);
 

source/blender/editors/space_nla/nla_intern.h

@@ -60,7 +60,7 @@ enum {
 	NLAEDIT_LRSEL_TEST	= -1,
 	NLAEDIT_LRSEL_NONE,
 	NLAEDIT_LRSEL_LEFT,
-	NLAEDIT_LRSEL_RIGHT,
+	NLAEDIT_LRSEL_RIGHT
 } eNlaEdit_LeftRightSelect_Mode;
 
 /* --- */
@@ -78,7 +78,7 @@ enum {
 	NLAEDIT_SNAP_CFRA = 1,
 	NLAEDIT_SNAP_NEAREST_FRAME,
 	NLAEDIT_SNAP_NEAREST_SECOND,
-	NLAEDIT_SNAP_NEAREST_MARKER,	
+	NLAEDIT_SNAP_NEAREST_MARKER
 } eNlaEdit_Snap_Mode;
 
 /* --- */

source/blender/editors/space_node/node_draw.c

@@ -173,7 +173,7 @@ static void node_uiblocks_init(const bContext *C, bNodeTree *ntree)
 		
 		if (node->flag & NODE_SELECT) {
 			/* ui block */
-			sprintf(str, "node buttons %p", node);
+			sprintf(str, "node buttons %p", (void *)node);
 			node->block= uiBeginBlock(C, CTX_wm_region(C), str, UI_EMBOSS);
 			uiBlockSetHandleFunc(node->block, do_node_internal_buttons, node);
 		}
@@ -184,7 +184,7 @@ static void node_uiblocks_init(const bContext *C, bNodeTree *ntree)
 		
 		if (!(node->flag & (NODE_GROUP_EDIT|NODE_SELECT))) {
 			/* ui block */
-			sprintf(str, "node buttons %p", node);
+			sprintf(str, "node buttons %p", (void *)node);
 			node->block= uiBeginBlock(C, CTX_wm_region(C), str, UI_EMBOSS);
 			uiBlockSetHandleFunc(node->block, do_node_internal_buttons, node);
 		}

source/blender/makesdna/DNA_action_types.h

@@ -56,7 +56,7 @@ typedef struct bMotionPathVert {
 /* bMotionPathVert->flag */
 typedef enum eMotionPathVert_Flag {
 		/* vert is selected */
-	MOTIONPATH_VERT_SEL		= (1<<0),
+	MOTIONPATH_VERT_SEL		= (1<<0)
 } eMotionPathVert_Flag;
 
 /* ........ */
@@ -79,7 +79,7 @@ typedef enum eMotionPath_Flag {
 		/* (for bones) path represents the head of the bone */
 	MOTIONPATH_FLAG_BHEAD		= (1<<0),
 		/* motion path is being edited */
-	MOTIONPATH_FLAG_EDIT		= (1<<1),
+	MOTIONPATH_FLAG_EDIT		= (1<<1)
 } eMotionPath_Flag;
 
 /* Visualisation General --------------------------- */
@@ -114,7 +114,7 @@ typedef struct bAnimVizSettings {
 /* bAnimVizSettings->recalc */
 typedef enum eAnimViz_RecalcFlags {
 		/* motionpaths need recalculating */
-	ANIMVIZ_RECALC_PATHS	= (1<<0),
+	ANIMVIZ_RECALC_PATHS	= (1<<0)
 } eAnimViz_RecalcFlags;
 
 
@@ -127,13 +127,13 @@ typedef enum eOnionSkin_Types {
 		/* show ghosts within the specified frame range */
 	GHOST_TYPE_RANGE,
 		/* show ghosts on keyframes within the specified range only */
-	GHOST_TYPE_KEYS,
+	GHOST_TYPE_KEYS
 } eOnionSkin_Types;
 
 /* bAnimVizSettings->ghost_flag */
 typedef enum eOnionSkin_Flag {
 		/* only show selected bones in ghosts */
-	GHOST_FLAG_ONLYSEL 	= (1<<0),
+	GHOST_FLAG_ONLYSEL 	= (1<<0)
 } eOnionSkin_Flag;
 
 
@@ -142,7 +142,7 @@ typedef enum eMotionPaths_Types {
 		/* show the paths along their entire ranges */
 	MOTIONPATH_TYPE_RANGE = 0,
 		/* only show the parts of the paths around the current frame */
-	MOTIONPATH_TYPE_ACFRA,
+	MOTIONPATH_TYPE_ACFRA
 } eMotionPath_Types;
 
 /* bAnimVizSettings->path_viewflag */
@@ -154,7 +154,7 @@ typedef enum eMotionPaths_ViewFlag {
 		/* show keyframe/frame numbers */
 	MOTIONPATH_VIEW_KFNOS		= (1<<2),
 		/* find keyframes in whole action (instead of just in matching group name) */
-	MOTIONPATH_VIEW_KFACT		= (1<<3),
+	MOTIONPATH_VIEW_KFACT		= (1<<3)
 } eMotionPath_ViewFlag;
 
 /* bAnimVizSettings->path_bakeflag */
@@ -164,7 +164,7 @@ typedef enum eMotionPaths_BakeFlag {
 		/* for bones - calculate head-points for curves instead of tips */
 	MOTIONPATH_BAKE_HEADS			= (1<<1),
 		/* motion paths exist for AnimVizSettings instance - set when calc for first time, and unset when clearing */
-	MOTIONPATH_BAKE_HAS_PATHS		= (1<<2),
+	MOTIONPATH_BAKE_HAS_PATHS		= (1<<2)
 } eMotionPath_BakeFlag;
 
 /* ************************************************ */
@@ -260,7 +260,7 @@ typedef enum ePchan_Flag {
 		/* has Spline IK */
 	POSE_HAS_IKS	= 	(1<<14),
 		/* spline IK solving */
-	POSE_IKSPLINE	= 	(1<<15),
+	POSE_IKSPLINE	= 	(1<<15)
 } ePchan_Flag;
 
 /* PoseChannel constflag (constraint detection) */
@@ -273,7 +273,7 @@ typedef enum ePchan_ConstFlag {
 		/* only for drawing Posemode too */
 	PCHAN_HAS_STRIDE	= (1<<4),
 		/* spline IK */
-	PCHAN_HAS_SPLINEIK	= (1<<5),
+	PCHAN_HAS_SPLINEIK	= (1<<5)
 } ePchan_ConstFlag;
 
 /* PoseChannel->ikflag */
@@ -291,7 +291,7 @@ typedef enum ePchan_IkFlag {
 
 	BONE_IK_NO_XDOF_TEMP = (1<<10),
 	BONE_IK_NO_YDOF_TEMP = (1<<11),
-	BONE_IK_NO_ZDOF_TEMP = (1<<12),
+	BONE_IK_NO_ZDOF_TEMP = (1<<12)
 } ePchan_IkFlag;
 
 /* PoseChannel->rotmode and Object->rotmode */
@@ -361,7 +361,7 @@ typedef enum ePose_Flags {
 		/* set by armature_rebuild_pose to give a chance to the IK solver to rebuild IK tree */
 	POSE_WAS_REBUILT = (1<<5),
 		/* set by game_copy_pose to indicate that this pose is used in the game engine */
-	POSE_GAME_ENGINE = (1<<6),
+	POSE_GAME_ENGINE = (1<<6)
 } ePose_Flags;
 
 /* IK Solvers ------------------------------------ */
@@ -369,7 +369,7 @@ typedef enum ePose_Flags {
 /* bPose->iksolver and bPose->ikparam->iksolver */
 typedef enum ePose_IKSolverType {
 	IKSOLVER_LEGACY = 0,
-	IKSOLVER_ITASC,
+	IKSOLVER_ITASC
 } ePose_IKSolverType;
 
 /* header for all bPose->ikparam structures */
@@ -398,7 +398,7 @@ typedef enum eItasc_Flags {
 	ITASC_AUTO_STEP = (1<<0),
 	ITASC_INITIAL_REITERATION = (1<<1),
 	ITASC_REITERATION = (1<<2),
-	ITASC_SIMULATION = (1<<3),
+	ITASC_SIMULATION = (1<<3)
 } eItasc_Flags;
 
 /* bItasc->solver */
@@ -493,7 +493,7 @@ typedef enum eAction_Flags {
 		/* flags for evaluation/editing */
 	ACT_MUTED		= (1<<9),
 	ACT_PROTECTED	= (1<<10),
-	ACT_DISABLED	= (1<<11),
+	ACT_DISABLED	= (1<<11)
 } eAction_Flags;
 
 
@@ -550,12 +550,12 @@ typedef enum eDopeSheet_FilterFlag {
 	ADS_FILTER_INCL_HIDDEN		= (1<<26),	/* include 'hidden' channels too (i.e. those from hidden Objects/Bones) */
 	
 		/* combination filters (some only used at runtime) */
-	ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM|ADS_FILTER_NOMAT|ADS_FILTER_NOLAM|ADS_FILTER_NOCUR|ADS_FILTER_NOPART|ADS_FILTER_NOARM),
+	ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM|ADS_FILTER_NOMAT|ADS_FILTER_NOLAM|ADS_FILTER_NOCUR|ADS_FILTER_NOPART|ADS_FILTER_NOARM)
 } eDopeSheet_FilterFlag;	
 
 /* DopeSheet general flags */
 typedef enum eDopeSheet_Flag {
-	ADS_FLAG_SUMMARY_COLLAPSED	= (1<<0),	/* when summary is shown, it is collapsed, so all other channels get hidden */
+	ADS_FLAG_SUMMARY_COLLAPSED	= (1<<0)	/* when summary is shown, it is collapsed, so all other channels get hidden */
 } eDopeSheet_Flag;
 
 
@@ -604,7 +604,7 @@ typedef enum eSAction_Flag {
 		/* don't perform realtime updates */
 	SACTION_NOREALTIMEUPDATES =	(1<<10),
 		/* move markers as well as keyframes */
-	SACTION_MARKERS_MOVE = (1<<11),
+	SACTION_MARKERS_MOVE = (1<<11)
 } eSAction_Flag;	
 
 /* SpaceAction Mode Settings */
@@ -616,7 +616,7 @@ typedef enum eAnimEdit_Context {
 		/* editing of gpencil data */
 	SACTCONT_GPENCIL,
 		/* dopesheet (default) */
-	SACTCONT_DOPESHEET,
+	SACTCONT_DOPESHEET
 } eAnimEdit_Context;
 
 /* SpaceAction AutoSnap Settings (also used by other Animation Editors) */
@@ -628,7 +628,7 @@ typedef enum eAnimEdit_AutoSnap {
 		/* snap to actual frames/seconds (nla-action time) */
 	SACTSNAP_FRAME,
 		/* snap to nearest marker */
-	SACTSNAP_MARKER,
+	SACTSNAP_MARKER
 } eAnimEdit_AutoSnap;
 
 
@@ -667,7 +667,7 @@ typedef enum ACHAN_FLAG {
 	ACHAN_EXPANDED 	= (1<<4),
 	ACHAN_SHOWIPO	= (1<<5),
 	ACHAN_SHOWCONS 	= (1<<6),
-	ACHAN_MOVED     = (1<<31),
+	ACHAN_MOVED     = (1<<31)
 } ACHAN_FLAG; 
 
 #endif

source/blender/makesdna/DNA_anim_types.h

@@ -88,7 +88,7 @@ typedef enum eFModifier_Flags {
 		/* modifier is active one (in UI) for editing purposes */
 	FMODIFIER_FLAG_ACTIVE		= (1<<2),
 		/* user wants modifier to be skipped */
-	FMODIFIER_FLAG_MUTED		= (1<<3),
+	FMODIFIER_FLAG_MUTED		= (1<<3)
 } eFModifier_Flags; 
 
 /* --- */
@@ -109,7 +109,7 @@ typedef struct FMod_Generator {
 /* generator modes */
 typedef enum eFMod_Generator_Modes {
 	FCM_GENERATOR_POLYNOMIAL	= 0,
-	FCM_GENERATOR_POLYNOMIAL_FACTORISED,
+	FCM_GENERATOR_POLYNOMIAL_FACTORISED
 } eFMod_Generator_Modes;
 
 
@@ -118,7 +118,7 @@ typedef enum eFMod_Generator_Modes {
  */
 typedef enum eFMod_Generator_Flags {
 		/* generator works in conjunction with other modifiers (i.e. doesn't replace those before it) */
-	FCM_GENERATOR_ADDITIVE	= (1<<0),
+	FCM_GENERATOR_ADDITIVE	= (1<<0)
 } eFMod_Generator_Flags;
 
 
@@ -149,7 +149,7 @@ typedef enum eFMod_Generator_Functions {
 	FCM_GENERATOR_FN_TAN,
 	FCM_GENERATOR_FN_SQRT,
 	FCM_GENERATOR_FN_LN,
-	FCM_GENERATOR_FN_SINC,
+	FCM_GENERATOR_FN_SINC
 } eFMod_Generator_Functions;
 
 
@@ -186,7 +186,7 @@ typedef enum eFMod_Cycling_Modes {
 	FCM_EXTRAPOLATE_NONE = 0,			/* don't do anything */
 	FCM_EXTRAPOLATE_CYCLIC,				/* repeat keyframe range as-is */
 	FCM_EXTRAPOLATE_CYCLIC_OFFSET,		/* repeat keyframe range, but with offset based on gradient between values */
-	FCM_EXTRAPOLATE_MIRROR,				/* alternate between forward and reverse playback of keyframe range */
+	FCM_EXTRAPOLATE_MIRROR				/* alternate between forward and reverse playback of keyframe range */
 } eFMod_Cycling_Modes;
 
 
@@ -209,7 +209,7 @@ typedef enum eFMod_Limit_Flags {
 	FCM_LIMIT_XMIN		= (1<<0),
 	FCM_LIMIT_XMAX		= (1<<1),
 	FCM_LIMIT_YMIN		= (1<<2),
-	FCM_LIMIT_YMAX		= (1<<3),
+	FCM_LIMIT_YMAX		= (1<<3)
 } eFMod_Limit_Flags;
 
 
@@ -229,7 +229,7 @@ typedef enum eFMod_Noise_Modifications {
 	FCM_NOISE_MODIF_REPLACE = 0,	/* Modify existing curve, matching it's shape */
 	FCM_NOISE_MODIF_ADD,			/* Add noise to the curve */
 	FCM_NOISE_MODIF_SUBTRACT,		/* Subtract noise from the curve */
-	FCM_NOISE_MODIF_MULTIPLY,		/* Multiply the curve by noise */
+	FCM_NOISE_MODIF_MULTIPLY		/* Multiply the curve by noise */
 } eFMod_Noise_Modifications;
 
 
@@ -379,7 +379,7 @@ typedef enum eDriver_Types {
 		/* smallest value */
 	DRIVER_TYPE_MIN,
 		/* largest value */
-	DRIVER_TYPE_MAX,
+	DRIVER_TYPE_MAX
 } eDriver_Types;
 
 /* driver flags */
@@ -396,7 +396,7 @@ typedef enum eDriver_Flags {
 		/* the names are cached so they dont need have python unicode versions created each time */
 	DRIVER_FLAG_RENAMEVAR	= (1<<4),
 		/* intermediate values of driver should be shown in the UI for debugging purposes */
-	DRIVER_FLAG_SHOWDEBUG	= (1<<5),
+	DRIVER_FLAG_SHOWDEBUG	= (1<<5)
 } eDriver_Flags;
 
 /* F-Curves -------------------------------------- */
@@ -467,20 +467,20 @@ typedef enum eFCurve_Flags {
 	FCURVE_DISCRETE_VALUES	= (1<<12),
 	
 		/* temporary tag for editing */
-	FCURVE_TAGGED			= (1<<15),
+	FCURVE_TAGGED			= (1<<15)
 } eFCurve_Flags;
 
 /* extrapolation modes (only simple value 'extending') */
 typedef enum eFCurve_Extend {
 	FCURVE_EXTRAPOLATE_CONSTANT	= 0,	/* just extend min/max keyframe value  */
-	FCURVE_EXTRAPOLATE_LINEAR,			/* just extend gradient of segment between first segment keyframes */
+	FCURVE_EXTRAPOLATE_LINEAR			/* just extend gradient of segment between first segment keyframes */
 } eFCurve_Extend;
 
 /* curve coloring modes */
 typedef enum eFCurve_Coloring {
 	FCURVE_COLOR_AUTO_RAINBOW = 0,		/* automatically determine color using rainbow (calculated at drawtime) */
 	FCURVE_COLOR_AUTO_RGB,				/* automatically determine color using XYZ (array index) <-> RGB */
-	FCURVE_COLOR_CUSTOM,				/* custom color */
+	FCURVE_COLOR_CUSTOM					/* custom color */
 } eFCurve_Coloring;
 
 /* ************************************************ */
@@ -575,7 +575,7 @@ typedef enum eNlaStrip_Blend_Mode {
 	NLASTRIP_MODE_REPLACE = 0,
 	NLASTRIP_MODE_ADD,
 	NLASTRIP_MODE_SUBTRACT,
-	NLASTRIP_MODE_MULTIPLY,
+	NLASTRIP_MODE_MULTIPLY
 } eNlaStrip_Blend_Mode;
 
 /* NLA Strip Extrpolation Mode */
@@ -585,7 +585,7 @@ typedef enum eNlaStrip_Extrapolate_Mode {
 		/* only hold+extend last frame */
 	NLASTRIP_EXTEND_HOLD_FORWARD,	
 		/* don't contribute at all */
-	NLASTRIP_EXTEND_NOTHING,
+	NLASTRIP_EXTEND_NOTHING
 } eNlaStrip_Extrapolate_Mode;
 
 /* NLA Strip Settings */
@@ -622,7 +622,7 @@ typedef enum eNlaStrip_Flag {
 	/* temporary editing flags */
 		/* NLA-Strip is really just a temporary meta used to facilitate easier transform code */
 	NLASTRIP_FLAG_TEMP_META		= (1<<30),
-	NLASTRIP_FLAG_EDIT_TOUCHED	= (1<<31),
+	NLASTRIP_FLAG_EDIT_TOUCHED	= (1<<31)
 } eNlaStrip_Flag;
 
 /* NLA Strip Type */
@@ -632,7 +632,7 @@ typedef enum eNlaStrip_Type {
 		/* 'transition' - blends between the adjacent strips */
 	NLASTRIP_TYPE_TRANSITION,
 		/* 'meta' - a strip which acts as a container for a few others */
-	NLASTRIP_TYPE_META,
+	NLASTRIP_TYPE_META
 } eNlaStrip_Type;
 
 /* NLA Tracks ------------------------------------- */
@@ -669,7 +669,7 @@ typedef enum eNlaTrack_Flag {
 	NLATRACK_PROTECTED	= (1<<4),
 	
 		/* track is not allowed to execute, usually as result of tweaking being enabled (internal flag) */
-	NLATRACK_DISABLED	= (1<<10),
+	NLATRACK_DISABLED	= (1<<10)
 } eNlaTrack_Flag;
 
 
@@ -705,7 +705,7 @@ typedef struct KS_Path {
 /* KS_Path->flag */
 typedef enum eKSP_Settings {
 		/* entire array (not just the specified index) gets keyframed */
-	KSP_FLAG_WHOLE_ARRAY	= (1<<0),
+	KSP_FLAG_WHOLE_ARRAY	= (1<<0)
 } eKSP_Settings;
 
 /* KS_Path->groupmode */
@@ -719,7 +719,7 @@ typedef enum eKSP_Grouping {
 		/* path should be grouped using name of inner-most context item from templates 
 		 * 	- this is most useful for relative KeyingSets only
 		 */
-	KSP_GROUP_TEMPLATE_ITEM,
+	KSP_GROUP_TEMPLATE_ITEM
 } eKSP_Grouping;
 
 /* KS_Path->templates  (Template Flags)
@@ -736,7 +736,7 @@ typedef enum eKSP_TemplateTypes {
 	KSP_TEMPLATE_NODE		 	= (1<<3),	/* #nod - selected node */
 	KSP_TEMPLATE_MODIFIER		= (1<<4),	/* #mod - active only */
 	
-	KSP_TEMPLATE_ROT		= (1<<16),	/* modify rotation paths based on rotation mode of Object or Pose Channel */
+	KSP_TEMPLATE_ROT			= (1<<16)	/* modify rotation paths based on rotation mode of Object or Pose Channel */
 } eKSP_TemplateTypes;
 
 /* ---------------- */
@@ -770,7 +770,7 @@ typedef enum eKS_Settings {
 		/* keyingset cannot be removed (and doesn't need to be freed) */
 	KEYINGSET_BUILTIN		= (1<<0),
 		/* keyingset does not depend on context info (i.e. paths are absolute) */
-	KEYINGSET_ABSOLUTE		= (1<<1),
+	KEYINGSET_ABSOLUTE		= (1<<1)
 } eKS_Settings;
 
 /* Flags for use by keyframe creation/deletion calls */
@@ -780,7 +780,7 @@ typedef enum eInsertKeyFlags {
 	INSERTKEY_FAST 		= (1<<2),	/* don't recalculate handles,etc. after adding key */
 	INSERTKEY_FASTR		= (1<<3),	/* don't realloc mem (or increase count, as array has already been set out) */
 	INSERTKEY_REPLACE 	= (1<<4),	/* only replace an existing keyframe (this overrides INSERTKEY_NEEDED) */
-	INSERTKEY_XYZ2RGB	= (1<<5),	/* transform F-Curves should have XYZ->RGB color mode */
+	INSERTKEY_XYZ2RGB	= (1<<5)	/* transform F-Curves should have XYZ->RGB color mode */
 } eInsertKeyFlags;
 
 /* ************************************************ */
@@ -877,14 +877,14 @@ typedef enum eAnimData_Flag {
 	ADT_UI_ACTIVE			= (1<<15),
 	
 		/* F-Curves from this AnimData block are not visible in the Graph Editor */
-	ADT_CURVES_NOT_VISIBLE	= (1<<16),
+	ADT_CURVES_NOT_VISIBLE	= (1<<16)
 } eAnimData_Flag;
 
 /* Animation Data recalculation settings (to be set by depsgraph) */
 typedef enum eAnimData_Recalc {
 	ADT_RECALC_DRIVERS		= (1<<0),
 	ADT_RECALC_ANIM			= (1<<1),
-	ADT_RECALC_ALL			= (ADT_RECALC_DRIVERS|ADT_RECALC_ANIM),
+	ADT_RECALC_ALL			= (ADT_RECALC_DRIVERS|ADT_RECALC_ANIM)
 } eAnimData_Recalc;
 
 /* Base Struct for Anim ------------------------------------- */

source/blender/makesdna/DNA_armature_types.h

@@ -180,7 +180,7 @@ typedef enum eBone_Flag {
 	BONE_EDITMODE_LOCKED		= (1<<19),	/* bone transforms are locked in EditMode */
 	BONE_TRANSFORM_CHILD		= (1<<20),	/* Indicates that a parent is also being transformed */
 	BONE_UNSELECTABLE			= (1<<21),	/* bone cannot be selected */
-	BONE_NO_LOCAL_LOCATION		= (1<<22),	/* bone location is in armature space */
+	BONE_NO_LOCAL_LOCATION		= (1<<22)	/* bone location is in armature space */
 } eBone_Flag;
 
 #endif

source/blender/makesdna/DNA_constraint_types.h

@@ -94,7 +94,7 @@ typedef struct bConstraintTarget {
 
 /* bConstraintTarget -> flag */
 typedef enum B_CONSTRAINT_TARGET_FLAG {
-	CONSTRAINT_TAR_TEMP = (1<<0),		/* temporary target-struct that needs to be freed after use */
+	CONSTRAINT_TAR_TEMP = (1<<0)		/* temporary target-struct that needs to be freed after use */
 } B_CONSTRAINT_TARGET_FLAG;
 
 /* bConstraintTarget/bConstraintOb -> type */
@@ -476,7 +476,7 @@ typedef enum eBConstraint_SpaceTypes {
 		 /* for posechannels - local with parent  */
 	CONSTRAINT_SPACE_PARLOCAL, /* = 3 */
 		/* for files from between 2.43-2.46 (should have been parlocal) */
-	CONSTRAINT_SPACE_INVALID, /* = 4. do not exchange for anything! */
+	CONSTRAINT_SPACE_INVALID /* = 4. do not exchange for anything! */
 } eBConstraint_SpaceTypes;
 
 /* bConstraintChannel.flag */
@@ -496,7 +496,7 @@ typedef enum eCopyRotation_Flags {
 	ROTLIKE_X_INVERT	= (1<<4),
 	ROTLIKE_Y_INVERT	= (1<<5),
 	ROTLIKE_Z_INVERT 	= (1<<6),
-	ROTLIKE_OFFSET		= (1<<7),
+	ROTLIKE_OFFSET		= (1<<7)
 } eCopyRotation_Flags;
 
 /* bLocateLikeConstraint.flag */
@@ -509,7 +509,7 @@ typedef enum eCopyLocation_Flags {
 	LOCLIKE_X_INVERT	= (1<<4),
 	LOCLIKE_Y_INVERT	= (1<<5),
 	LOCLIKE_Z_INVERT	= (1<<6),
-	LOCLIKE_OFFSET		= (1<<7),
+	LOCLIKE_OFFSET		= (1<<7)
 } eCopyLocation_Flags;
  
 /* bSizeLikeConstraint.flag */
@@ -517,28 +517,28 @@ typedef enum eCopyScale_Flags {
 	SIZELIKE_X		= (1<<0),
 	SIZELIKE_Y		= (1<<1),
 	SIZELIKE_Z		= (1<<2), 
-	SIZELIKE_OFFSET = (1<<3),
+	SIZELIKE_OFFSET = (1<<3)
 } eCopyScale_Flags;
 
 /* bSameVolumeConstraint.flag */
 typedef enum eSameVolume_Modes {
 	SAMEVOL_X		= 0,
 	SAMEVOL_Y,
-	SAMEVOL_Z, 
+	SAMEVOL_Z
 } eSameVolume_Modes;
 
 /* Locked-Axis Values (Locked Track) */
 typedef enum eLockAxis_Modes {
 	LOCK_X	= 0,
 	LOCK_Y,
-	LOCK_Z,
+	LOCK_Z
 } eLockAxis_Modes;
 
 /* Up-Axis Values (TrackTo and Locked Track) */
 typedef enum eUpAxis_Modes {
 	UP_X	= 0,
 	UP_Y,
-	UP_Z,
+	UP_Z
 } eUpAxis_Modes;
 
 /* Tracking axis (TrackTo, Locked Track, Damped Track) */
@@ -548,19 +548,19 @@ typedef enum eTrackToAxis_Modes {
 	TRACK_Z,
 	TRACK_nX,
 	TRACK_nY,
-	TRACK_nZ,
+	TRACK_nZ
 } eTrackToAxis_Modes;
 
 /* FollowPath flags */
 typedef enum eFollowPath_Flags {
 	FOLLOWPATH_FOLLOW	= (1<<0),
 	FOLLOWPATH_STATIC	= (1<<1),
-	FOLLOWPATH_RADIUS	= (1<<2),
+	FOLLOWPATH_RADIUS	= (1<<2)
 } eFollowPath_Flags;
 
 /* bTrackToConstraint->flags */
 typedef enum eTrackTo_Flags {
-	TARGET_Z_UP 	= (1<<0),
+	TARGET_Z_UP 	= (1<<0)
 } eTrackTo_Flags;
 
 /* Strech To Constraint -> volmode */
@@ -568,14 +568,14 @@ typedef enum eStretchTo_VolMode {
 	VOLUME_XZ	= 0,
 	VOLUME_X,
 	VOLUME_Z,
-	NO_VOLUME,
+	NO_VOLUME
 } eStretchTo_VolMode;
 
 /* Stretch To Constraint -> plane mode */
 typedef enum eStretchTo_PlaneMode {
 	PLANE_X		= 0,
 	PLANE_Y,
-	PLANE_Z,
+	PLANE_Z
 } eStretchTo_PlaneMode;
 
 /* Clamp-To Constraint ->flag */
@@ -583,12 +583,12 @@ typedef enum eClampTo_Modes {
 	CLAMPTO_AUTO = 0,
 	CLAMPTO_X,
 	CLAMPTO_Y,
-	CLAMPTO_Z,
+	CLAMPTO_Z
 } eClampTo_Modes;
 
 /* ClampTo Constraint ->flag2 */
 typedef enum eClampTo_Flags {
-	CLAMPTO_CYCLIC	= (1<<0),
+	CLAMPTO_CYCLIC	= (1<<0)
 } eClampTo_Flags;
 
 /* bKinematicConstraint->flag */
@@ -611,7 +611,7 @@ typedef enum eKinematic_Flags {
 	CONSTRAINT_IK_NO_ROT_Y		= (1<<12),
 	CONSTRAINT_IK_NO_ROT_Z		= (1<<13),
 	/* axis relative to target */
-	CONSTRAINT_IK_TARGETAXIS	= (1<<14),
+	CONSTRAINT_IK_TARGETAXIS	= (1<<14)
 } eKinematic_Flags;
 
 /* bSplineIKConstraint->flag */
@@ -625,7 +625,7 @@ typedef enum eSplineIK_Flags {
 	/* evenly distribute the bones along the path regardless of length */
 	CONSTRAINT_SPLINEIK_EVENSPLITS		= (1<<3),	
 	/* don't adjust the x and z scaling of the bones by the curve radius */
-	CONSTRAINT_SPLINEIK_NO_CURVERAD	= (1<<4),
+	CONSTRAINT_SPLINEIK_NO_CURVERAD	= (1<<4)
 } eSplineIK_Flags;
 
 /* bSplineIKConstraint->xzScaleMode */
@@ -635,14 +635,14 @@ typedef enum eSplineIK_XZScaleModes {
 	/* bones in the chain should take their x/z scales from the original scaling */
 	CONSTRAINT_SPLINEIK_XZS_ORIGINAL,
 	/* x/z scales are the inverse of the y-scale */
-	CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC,
+	CONSTRAINT_SPLINEIK_XZS_VOLUMETRIC
 } eSplineIK_XZScaleModes;
 
 /* MinMax (floor) flags */
 typedef enum eFloor_Flags {
 	MINMAX_STICKY	= (1<<0),
 	MINMAX_STUCK	= (1<<1),
-	MINMAX_USEROT	= (1<<2),
+	MINMAX_USEROT	= (1<<2)
 } eFloor_Flags;
 
 /* transform limiting constraints -> flag2 */
@@ -650,7 +650,7 @@ typedef enum eTransformLimits_Flags2 {
 	/* not used anymore - for older Limit Location constraints only */
 	LIMIT_NOPARENT 	= (1<<0),
 	/* for all Limit constraints - allow to be used during transform? */
-	LIMIT_TRANSFORM = (1<<1),
+	LIMIT_TRANSFORM = (1<<1)
 } eTransformLimits_Flags2;
 
 /* transform limiting constraints -> flag (own flags)  */
@@ -660,33 +660,33 @@ typedef enum eTransformLimits_Flags {
 	LIMIT_YMIN = (1<<2),
 	LIMIT_YMAX = (1<<3),
 	LIMIT_ZMIN = (1<<4),
-	LIMIT_ZMAX = (1<<5),
+	LIMIT_ZMAX = (1<<5)
 } eTransformLimits_Flags;
 
 /* limit rotation constraint -> flag (own flags) */
 typedef enum eRotLimit_Flags {
 	LIMIT_XROT = (1<<0),
 	LIMIT_YROT = (1<<1),
-	LIMIT_ZROT = (1<<2),
+	LIMIT_ZROT = (1<<2)
 } eRotLimit_Flags;
 
 /* distance limit constraint */
 	/* bDistLimitConstraint->flag */
 typedef enum eDistLimit_Flag {
-	LIMITDIST_USESOFT	= (1<<0),
+	LIMITDIST_USESOFT	= (1<<0)
 } eDistLimit_Flag;
 
 	/* bDistLimitConstraint->mode */
 typedef enum eDistLimit_Modes {
 	LIMITDIST_INSIDE = 0,
 	LIMITDIST_OUTSIDE,
-	LIMITDIST_ONSURFACE,
+	LIMITDIST_ONSURFACE
 } eDistLimit_Modes;
 	
 /* python constraint -> flag */
 typedef enum ePyConstraint_Flags {
 	PYCON_USETARGETS	= (1<<0),
-	PYCON_SCRIPTERROR	= (1<<1),
+	PYCON_SCRIPTERROR	= (1<<1)
 } ePyConstraint_Flags;
 
 /* ChildOf Constraint -> flag */
@@ -699,7 +699,7 @@ typedef enum eChildOf_Flags {
 	CHILDOF_ROTZ	= (1<<5),
 	CHILDOF_SIZEX	= (1<<6),
 	CHILDOF_SIZEY	= (1<<7),
-	CHILDOF_SIZEZ	= (1<<8),
+	CHILDOF_SIZEZ	= (1<<8)
 } eChildOf_Flags;
 
 /* Pivot Constraint */
@@ -720,7 +720,7 @@ typedef enum ePivotConstraint_Axis {
 	/* consider +ve y-axis rotations */
 	PIVOTCON_AXIS_Y,
 	/* consider +ve z-axis rotations */
-	PIVOTCON_AXIS_Z,
+	PIVOTCON_AXIS_Z
 } ePivotConstraint_Axis;
 
 	/* settings for Pivot Constraint in general */
@@ -728,7 +728,7 @@ typedef enum ePivotConstraint_Flag {
 	/* offset is to be interpreted as being a fixed-point in space */
 	PIVOTCON_FLAG_OFFSET_ABS	= (1<<0),
 	/* rotation-based activation uses negative rotation to drive result */
-	PIVOTCON_FLAG_ROTACT_NEG	= (1<<1),
+	PIVOTCON_FLAG_ROTACT_NEG	= (1<<1)
 } ePivotConstraint_Flag;
 
 /* Rigid-Body Constraint */

source/blender/makesdna/DNA_curve_types.h

@@ -314,21 +314,21 @@ typedef enum eBezTriple_Handle {
 	HD_AUTO,
 	HD_VECT,
 	HD_ALIGN,
-	HD_AUTO_ANIM,	/* not real handle type, but is just used as dummy item for anim code */
+	HD_AUTO_ANIM	/* not real handle type, but is just used as dummy item for anim code */
 } eBezTriple_Handle;
 
 /* interpolation modes (used only for BezTriple->ipo) */
 typedef enum eBezTriple_Interpolation {
 	BEZT_IPO_CONST = 0,	/* constant interpolation */
 	BEZT_IPO_LIN,		/* linear interpolation */
-	BEZT_IPO_BEZ,		/* bezier interpolation */
+	BEZT_IPO_BEZ		/* bezier interpolation */
 } eBezTriple_Interpolation;
 
 /* types of keyframe (used only for BezTriple->hide when BezTriple is used in F-Curves) */
 typedef enum eBezTriple_KeyframeType {
 	BEZT_KEYTYPE_KEYFRAME = 0,	/* default - 'proper' Keyframe */
 	BEZT_KEYTYPE_EXTREME,		/* 'extreme' keyframe */
-	BEZT_KEYTYPE_BREAKDOWN,		/* 'breakdown' keyframe */
+	BEZT_KEYTYPE_BREAKDOWN		/* 'breakdown' keyframe */
 } eBezTriple_KeyframeType;
 
 /* checks if the given BezTriple is selected */

source/blender/makesdna/DNA_windowmanager_types.h

@@ -81,7 +81,7 @@ typedef enum ReportType {
 enum ReportListFlags {
 	RPT_PRINT = 1,
 	RPT_STORE = 2,
-	RPT_FREE = 4,
+	RPT_FREE = 4
 };
 #
 #
@@ -313,7 +313,7 @@ typedef struct wmOperator {
 typedef enum wmRadialControlMode {
 	WM_RADIALCONTROL_SIZE,
 	WM_RADIALCONTROL_STRENGTH,
-	WM_RADIALCONTROL_ANGLE,
+	WM_RADIALCONTROL_ANGLE
 } wmRadialControlMode;
 
 #endif /* DNA_WINDOWMANAGER_TYPES_H */

source/blender/makesdna/intern/makesdna.c

@@ -244,7 +244,7 @@ int add_type(char *str, int len)
 	
 	if(nr_types>=maxnr) {
 		printf("too many types\n");
-		return nr_types-1;;
+		return nr_types-1;
 	}
 	nr_types++;
 	

source/blender/makesrna/RNA_types.h

@@ -307,7 +307,7 @@ typedef enum StructFlag {
 	STRUCT_RUNTIME = 4,
 	STRUCT_GENERATED = 8,
 	STRUCT_FREE_POINTERS = 16,
-	STRUCT_NO_IDPROPERTIES = 32, /* Menu's and Panels don't need properties */
+	STRUCT_NO_IDPROPERTIES = 32 /* Menu's and Panels don't need properties */
 } StructFlag;
 
 typedef int (*StructValidateFunc)(struct PointerRNA *ptr, void *data, int *have_function);

source/blender/makesrna/intern/rna_sculpt_paint.c

@@ -77,7 +77,7 @@ static EnumPropertyItem particle_edit_cache_brush_items[] = {
 static PointerRNA rna_ParticleEdit_brush_get(PointerRNA *ptr)
 {
 	ParticleEditSettings *pset= (ParticleEditSettings*)ptr->data;
-	ParticleBrushData *brush= NULL;;
+	ParticleBrushData *brush= NULL;
 
 	if(pset->brushtype != PE_BRUSH_NONE)
 		brush= &pset->brush[pset->brushtype];

source/blender/modifiers/intern/MOD_meshdeform.c

@@ -347,7 +347,7 @@ static void deformVerts(ModifierData *md, Object *ob,
 						int UNUSED(useRenderParams),
 						int UNUSED(isFinalCalc))
 {
-	DerivedMesh *dm= get_dm(ob, NULL, derivedData, NULL, 0);;
+	DerivedMesh *dm= get_dm(ob, NULL, derivedData, NULL, 0);
 
 	modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */
 	
@@ -363,7 +363,7 @@ static void deformVertsEM(ModifierData *md, Object *ob,
 						float (*vertexCos)[3],
 						int numVerts)
 {
-	DerivedMesh *dm= get_dm(ob, NULL, derivedData, NULL, 0);;
+	DerivedMesh *dm= get_dm(ob, NULL, derivedData, NULL, 0);
 
 	meshdeformModifier_do(md, ob, dm, vertexCos, numVerts);
 

source/blender/modifiers/intern/MOD_mirror.c

@@ -61,7 +61,7 @@ static void copyData(ModifierData *md, ModifierData *target)
 	tmmd->axis = mmd->axis;
 	tmmd->flag = mmd->flag;
 	tmmd->tolerance = mmd->tolerance;
-	tmmd->mirror_ob = mmd->mirror_ob;;
+	tmmd->mirror_ob = mmd->mirror_ob;
 }
 
 static void foreachObjectLink(

source/blender/python/generic/mathutils_color.c

@@ -329,9 +329,9 @@ static PySequenceMethods Color_SeqMethods = {
 	(binaryfunc) NULL,						/* sq_concat */
 	(ssizeargfunc) NULL,					/* sq_repeat */
 	(ssizeargfunc) Color_item,				/* sq_item */
-	(ssizessizeargfunc) NULL,				/* sq_slice, deprecated */
+	NULL,									/* sq_slice, deprecated */
 	(ssizeobjargproc) Color_ass_item,		/* sq_ass_item */
-	(ssizessizeobjargproc) NULL,			/* sq_ass_slice, deprecated */
+	NULL,									/* sq_ass_slice, deprecated */
 	(objobjproc) NULL,						/* sq_contains */
 	(binaryfunc) NULL,						/* sq_inplace_concat */
 	(ssizeargfunc) NULL,					/* sq_inplace_repeat */

source/blender/python/generic/mathutils_vector.c

@@ -573,7 +573,7 @@ static char Vector_Difference_doc[] =
 "   :return: the rotational difference between the two vectors.\n"
 "   :rtype: :class:`Quaternion`\n"
 "\n"
-"   .. note:: 2D vectors raise an :exc:`AttributeError`.\n";;
+"   .. note:: 2D vectors raise an :exc:`AttributeError`.\n";
 
 static PyObject *Vector_Difference(VectorObject *self, VectorObject *value )
 {

source/blender/python/intern/bpy_util.c

@@ -31,8 +31,8 @@
 #include "../generic/py_capi_utils.h"
 
 bContext*	__py_context = NULL;
-bContext*	BPy_GetContext(void) { return __py_context; };
+bContext*	BPy_GetContext(void) { return __py_context; }
-void		BPy_SetContext(bContext *C) { __py_context= C; };
+void		BPy_SetContext(bContext *C) { __py_context= C; }
 
 int BPY_class_validate(const char *class_type, PyObject *class, PyObject *base_class, BPY_class_attr_check* class_attrs, PyObject **py_class_attrs)
 {

source/blender/render/intern/source/texture.c

@@ -731,7 +731,7 @@ static int texnoise(Tex *tex, TexResult *texres)
 		div*= 3.0;
 	}
 	
-	texres->tin= ((float)val)/div;;
+	texres->tin= ((float)val)/div;
 
 	BRICONT;
 	return TEX_INT;

source/blender/windowmanager/WM_api.h

@@ -332,7 +332,7 @@ void		WM_jobs_callbacks(struct wmJob *,
 
 void		WM_jobs_start(struct wmWindowManager *wm, struct wmJob *);
 void		WM_jobs_stop(struct wmWindowManager *wm, void *owner, void *startjob);
-void		WM_jobs_kill(struct wmWindowManager *wm, void *owner, void *startjob);
+void		WM_jobs_kill(struct wmWindowManager *wm, void *owner, void (*)(void *, short int *, short int *, float *));
 void		WM_jobs_stop_all(struct wmWindowManager *wm);
 
 			/* clipboard */

source/blender/windowmanager/intern/wm_jobs.c

@@ -351,7 +351,7 @@ void WM_jobs_stop(wmWindowManager *wm, void *owner, void *startjob)
 }
 
 /* actually terminate thread and job timer */
-void WM_jobs_kill(wmWindowManager *wm, void *owner, void *startjob)
+void WM_jobs_kill(wmWindowManager *wm, void *owner, void (*startjob)(void *, short int *, short int *, float *))
 {
 	wmJob *steve;
 	

source/blender/windowmanager/wm_cursors.h

@@ -47,7 +47,7 @@ enum {
 	CURSOR_STD, 
 	CURSOR_NONE,
 	CURSOR_PENCIL,
-	CURSOR_COPY,
+	CURSOR_COPY
 };