Fix minor warnings found with g++.

3 files changed, 6 insertions, 8 deletions

diff --git a/src/mesa/swrast/s_auxbuffer.c b/src/mesa/swrast/s_auxbuffer.c
index ca36d90ded8..859bc3197bd 100644
--- a/src/mesa/swrast/s_auxbuffer.c
+++ b/src/mesa/swrast/s_auxbuffer.c
@@ -34,7 +34,7 @@
 void
 _swrast_alloc_aux_buffers( GLframebuffer *buffer )
 {
-   GLuint i;
+   GLint i;
 
    for (i = 0; i < buffer->Visual.numAuxBuffers; i++) {
       if (buffer->AuxBuffers[i]) {
@@ -42,8 +42,8 @@ _swrast_alloc_aux_buffers( GLframebuffer *buffer )
          buffer->AuxBuffers[i] = NULL;
       }
 
-      buffer->AuxBuffers[i] = _mesa_malloc(buffer->Width * buffer->Height
-                                           * 4 * sizeof(GLchan));
+      buffer->AuxBuffers[i] = (GLchan *) _mesa_malloc(buffer->Width
+                                        * buffer->Height * 4 * sizeof(GLchan));
    }
 }
 
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c
index 6c8f515b626..8bd9854f0ca 100644
--- a/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@ -54,7 +54,8 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
 
    ASSERT(ctx->RenderMode == GL_RENDER);
 
-   bitmap = _swrast_validate_pbo_access(unpack, width, height, 1,
+   bitmap = (const GLubyte *) _swrast_validate_pbo_access(unpack, width,
+                                        height, 1,
                                         GL_COLOR_INDEX, GL_BITMAP,
                                         (GLvoid *) bitmap);
    if (!bitmap) {
diff --git a/src/mesa/swrast/s_feedback.c b/src/mesa/swrast/s_feedback.c
index 2ebaaff3c19..892c40db6a2 100644
--- a/src/mesa/swrast/s_feedback.c
+++ b/src/mesa/swrast/s_feedback.c
@@ -51,7 +51,6 @@ static void feedback_vertex( GLcontext *ctx,
    GLfloat win[4];
    GLfloat color[4];
    GLfloat tc[4];
-   GLuint index;
 
    win[0] = v->win[0];
    win[1] = v->win[1];
@@ -75,9 +74,7 @@ static void feedback_vertex( GLcontext *ctx,
       COPY_4V(tc, v->texcoord[texUnit]);
    }
 
-   index = v->index;
-
-   _mesa_feedback_vertex( ctx, win, color, (GLfloat)index, tc );
+   _mesa_feedback_vertex( ctx, win, color, (GLfloat) v->index, tc );
 }