fix for warnings and implicit declarations

also fixed smoke comparing a float's mem-location rather then its value.

5 files changed, 9 insertions, 8 deletions

diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 144ed3bc624..b65d77751e2 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -33,6 +33,7 @@
 #include "DNA_modifier_types.h"		/* needed for all enum typdefs */
 #include "BKE_customdata.h"
 
+struct ID;
 struct EditMesh;
 struct DerivedMesh;
 struct DagForest;
diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c
index bc9a0ee99c1..8827897a509 100644
--- a/source/blender/blenkernel/intern/exotic.c
+++ b/source/blender/blenkernel/intern/exotic.c
@@ -334,7 +334,7 @@ static void read_stl_mesh_ascii(Scene *scene, char *str)
 	 */
 	numtenthousand = 1;
 	vertdata = malloc(numtenthousand*3*30000*sizeof(float));	// uses realloc!
-	if (!vertdata); STLALLOCERROR;
+	if (!vertdata) { STLALLOCERROR; }
 
 	linenum = 1;
 	/* Get rid of the first line */
@@ -357,7 +357,7 @@ static void read_stl_mesh_ascii(Scene *scene, char *str)
 			++numtenthousand;
 			vertdata = realloc(vertdata, 
 							   numtenthousand*3*30000*sizeof(float));
-			if (!vertdata); STLALLOCERROR;
+			if (!vertdata) { STLALLOCERROR; }
 		}
 		
 		/* Don't read normal, but check line for proper syntax anyway
@@ -1687,7 +1687,7 @@ static void displist_to_objects(Scene *scene, ListBase *lbase)
 
 	if(totvert==0) {
 		
-		if(ivsurf==0) ; //XXX error("Found no data");
+		if(ivsurf==0) {}; //XXX error("Found no data");
 		if(lbase->first) BLI_freelistN(lbase);
 		
 		return;
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 8935d33b3bf..d86d563aaa2 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -5832,7 +5832,7 @@ static void smokeModifier_freeData(ModifierData *md)
 
 static void smokeModifier_deformVerts(
 					 ModifierData *md, Object *ob, DerivedMesh *derivedData,
-      float (*vertexCos)[3], int numVerts)
+      float (*vertexCos)[3], int numVerts, int useRenderParams, int isFinalCalc)
 {
 	SmokeModifierData *smd = (SmokeModifierData*) md;
 	DerivedMesh *dm = NULL;
diff --git a/source/blender/blenkernel/intern/sequence.c b/source/blender/blenkernel/intern/sequence.c
index 3eeecd94a85..4832086ac88 100644
--- a/source/blender/blenkernel/intern/sequence.c
+++ b/source/blender/blenkernel/intern/sequence.c
@@ -58,7 +58,7 @@
 /* **** XXX ******** */
 static int seqrectx= 0;	/* bad bad global! */
 static int seqrecty= 0;
-static void waitcursor() {}
+static void waitcursor(int val) {}
 static int blender_test_break() {return 0;}
 
 /* **** XXX ******** */
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 7870e53963d..fbf6beb835f 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1144,7 +1144,7 @@ static void bresenham_linie_3D(SmokeModifierData *smd, int x1, int y1, int z1, i
 				calc_voxel_transp(smd, pixel, tRay);
 			else
 				calc_voxel_transp_big(smd, pixel, tRay);
-        	if(tRay < 0)
+        	if(*tRay < 0.0f)
         		return;
             if (err_1 > 0) {
                 pixel[1] += y_inc;
@@ -1166,7 +1166,7 @@ static void bresenham_linie_3D(SmokeModifierData *smd, int x1, int y1, int z1, i
 				calc_voxel_transp(smd, pixel, tRay);
 			else
 				calc_voxel_transp_big(smd, pixel, tRay);
-        	if(tRay < 0)
+        	if(*tRay < 0.0f)
         		return;
             if (err_1 > 0) {
                 pixel[0] += x_inc;
@@ -1188,7 +1188,7 @@ static void bresenham_linie_3D(SmokeModifierData *smd, int x1, int y1, int z1, i
 				calc_voxel_transp(smd, pixel, tRay);
 			else
 				calc_voxel_transp_big(smd, pixel, tRay);
-        	if(tRay < 0)
+        	if(*tRay < 0.0f)
         		return;
             if (err_1 > 0) {
                 pixel[1] += y_inc;