The occosional warning cleanup;

- unused varialbles
- unused functions
- wrong casted callback for SDL
- gcc3 related; (GLint *) for opengl calls.

6 files changed, 16 insertions, 14 deletions

diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 36575a6c5c6..d81ab555e49 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -1583,7 +1583,7 @@ void enter_editmode(int wc)
 void exit_editmode(int flag)	/* freedata==0 at render, 1= freedata, 2= do undo buffer too */
 {
 	Object *ob;
-	int freedata = flag & EM_FREEDATA, freeundo = flag & EM_FREEUNDO;
+	int freedata = flag & EM_FREEDATA;
 	
 	if(G.obedit==NULL) return;
 
@@ -1663,7 +1663,7 @@ void exit_editmode(int flag)	/* freedata==0 at render, 1= freedata, 2= do undo b
 
 	scrarea_queue_headredraw(curarea);
 	
-	if(G.obedit==NULL && flag & EM_FREEUNDO) 
+	if(G.obedit==NULL && (flag & EM_FREEUNDO)) 
 		BIF_undo_push("Editmode");
 	
 	if(flag & EM_WAITCURSOR) waitcursor(0);
diff --git a/source/blender/src/fluidsim.c b/source/blender/src/fluidsim.c
index 276650a9546..712548387b3 100644
--- a/source/blender/src/fluidsim.c
+++ b/source/blender/src/fluidsim.c
@@ -313,6 +313,7 @@ void fluidsimGetGeometryObjFilename(struct Object *ob, char *dst) { //, char *sr
 
 // simplify channels before printing
 // for API this is done anyway upon init
+#if 0
 static void fluidsimPrintChannel(FILE *file, float *channel, int paramsize, char *str, int entries) 
 { 
 	int i,j; 
@@ -338,7 +339,7 @@ static void fluidsimPrintChannel(FILE *file, float *channel, int paramsize, char
 
 	fprintf(file,  "      ; \n" ); 
 }
-
+#endif
 
 static void fluidsimInitChannel(float **setchannel, int size, float *time, 
 		int *icuIds, float *defaults, Ipo* ipo, int entries) {
@@ -422,7 +423,7 @@ int			globalBakeState = 0; // 0 everything ok, -1 abort simulation, -2 sim error
 int			globalBakeFrame = 0;
 
 // run simulation in seperate thread
-int fluidsimSimulateThread(void) { // *ptr) {
+static int fluidsimSimulateThread(void *unused) { // *ptr) {
 	//char* fnameCfgPath = (char*)(ptr);
 	int ret=0;
 	
diff --git a/source/blender/src/glutil.c b/source/blender/src/glutil.c
index 711c809ce40..fde0601e3ee 100644
--- a/source/blender/src/glutil.c
+++ b/source/blender/src/glutil.c
@@ -34,6 +34,7 @@
 
 #include <stdio.h>
 #include <math.h>
+#include <string.h>
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c
index 57d52edc109..6d9e216c47a 100644
--- a/source/blender/src/headerbuttons.c
+++ b/source/blender/src/headerbuttons.c
@@ -1294,7 +1294,7 @@ void do_global_buttons(unsigned short event)
 		else if(G.buts->mainb==CONTEXT_EDITING) {
 			SculptData *sd= &G.scene->sculptdata;
 			if(sd && sd->texact != -1) {
-				if(sd->mtex[sd->texact]) autotexname(sd->mtex[sd->texact]);
+				if(sd->mtex[sd->texact]) autotexname(sd->mtex[sd->texact]->tex);
 
 				BIF_undo_push("Auto name");
 				allqueue(REDRAWBUTSEDIT, 0);
diff --git a/source/blender/src/retopo.c b/source/blender/src/retopo.c
index 3d08f0a4e73..164823693a0 100644
--- a/source/blender/src/retopo.c
+++ b/source/blender/src/retopo.c
@@ -421,7 +421,7 @@ void retopo_paint_view_update(struct View3D *v3d)
 			for(p= l->points.first; p; p= p->next) {
 				gluProject(p->co[0],p->co[1],p->co[2], v3d->retopo_view_data->modelviewmat,
 					   v3d->retopo_view_data->projectionmat,
-					   v3d->retopo_view_data->viewport, &ux, &uy, &uz);
+					   (GLint *)v3d->retopo_view_data->viewport, &ux, &uy, &uz);
 				p->loc.x= ux;
 				p->loc.y= uy;
 			}
@@ -701,7 +701,7 @@ void retopo_do_2d(View3D *v3d, short proj[2], float *v, char adj)
 				/* Find the depth of (0,0,0); */
 				gluProject(0,0,0,v3d->retopo_view_data->modelviewmat,
 					   v3d->retopo_view_data->projectionmat,
-					   v3d->retopo_view_data->viewport,&px,&py,&pz);
+					   (GLint *)v3d->retopo_view_data->viewport,&px,&py,&pz);
 				depth= pz;
 			}
 			else return;
@@ -710,7 +710,7 @@ void retopo_do_2d(View3D *v3d, short proj[2], float *v, char adj)
 		/* Find 3D location with new depth (unproject) */
 		gluUnProject(proj[0],proj[1],depth,v3d->retopo_view_data->modelviewmat,
 			     v3d->retopo_view_data->projectionmat,
-			     v3d->retopo_view_data->viewport,&px,&py,&pz);
+			     (GLint *)v3d->retopo_view_data->viewport,&px,&py,&pz);
 		
 		v[0]= px;
 		v[1]= py;
@@ -725,7 +725,7 @@ void retopo_do_vert(View3D *v3d, float *v)
 
 	/* Find 2D location (project) */
 	gluProject(v[0],v[1],v[2],v3d->retopo_view_data->modelviewmat,v3d->retopo_view_data->projectionmat,
-		   v3d->retopo_view_data->viewport,&px,&py,&pz);
+		   (GLint *)v3d->retopo_view_data->viewport,&px,&py,&pz);
 	proj[0]= px;
 	proj[1]= py;
 	
@@ -799,7 +799,7 @@ void retopo_matrix_update(View3D *v3d)
 		if(rvd && rvd->queue_matrix_update) {
 			glGetDoublev(GL_MODELVIEW_MATRIX, rvd->modelviewmat);
 			glGetDoublev(GL_PROJECTION_MATRIX, rvd->projectionmat);
-			glGetIntegerv(GL_VIEWPORT, rvd->viewport);
+			glGetIntegerv(GL_VIEWPORT, (GLint *)rvd->viewport);
 			rvd->viewport[0]= rvd->viewport[1]= 0;
 
 			rvd->queue_matrix_update= 0;
diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c
index 6b908c1d593..6df70b2cb6c 100644
--- a/source/blender/src/sculptmode.c
+++ b/source/blender/src/sculptmode.c
@@ -400,7 +400,7 @@ void init_sculptmatrices()
 
 	glGetDoublev(GL_MODELVIEW_MATRIX, G.scene->sculptdata.modelviewmat);
 	glGetDoublev(GL_PROJECTION_MATRIX, G.scene->sculptdata.projectionmat);
-	glGetIntegerv(GL_VIEWPORT, G.scene->sculptdata.viewport);
+	glGetIntegerv(GL_VIEWPORT, (GLint *)G.scene->sculptdata.viewport);
 	/* Set up viewport so that gluUnProject will give correct values */
 	G.scene->sculptdata.viewport[0] = 0;
 	G.scene->sculptdata.viewport[1] = 0;
@@ -439,7 +439,7 @@ vec3f unproject(const short x, const short y, const float z)
 
         gluUnProject(x,y,z, G.scene->sculptdata.modelviewmat,
 		     G.scene->sculptdata.projectionmat,
-		     G.scene->sculptdata.viewport, &ux, &uy, &uz );
+		     (GLint *)G.scene->sculptdata.viewport, &ux, &uy, &uz );
 	p.x= ux;
 	p.y= uy;
 	p.z= uz;
@@ -452,7 +452,7 @@ void project(const float v[3], short p[2])
 
 	gluProject(v[0],v[1],v[2], G.scene->sculptdata.modelviewmat,
 		   G.scene->sculptdata.projectionmat,
-		   G.scene->sculptdata.viewport, &ux, &uy, &uz);
+		   (GLint *)G.scene->sculptdata.viewport, &ux, &uy, &uz);
 	p[0]= ux;
 	p[1]= uy;
 }
@@ -1087,7 +1087,7 @@ void sculptmode_propset(unsigned short event)
 			pd->origstrength= sculptmode_brush()->strength;
 
 			/* Prepare texture */
-			glGenTextures(1, &pd->tex);
+			glGenTextures(1, (GLint *)&pd->tex);
 			glBindTexture(GL_TEXTURE_2D, pd->tex);
 
 			if(G.scene->sculptdata.texrept!=SCULPTREPT_3D)