More g++ warning fixes. Fixes for CHAN_BITS==16, it seems to work.

3 files changed, 7 insertions, 6 deletions

diff --git a/src/mesa/swrast_setup/ss_triangle.c b/src/mesa/swrast_setup/ss_triangle.c
index 2ea04ce0aac..ad44b1453fd 100644
--- a/src/mesa/swrast_setup/ss_triangle.c
+++ b/src/mesa/swrast_setup/ss_triangle.c
@@ -139,8 +139,8 @@ static void _swsetup_render_point_tri( GLcontext *ctx,
    }
 }
 
-#define SS_COLOR(a,b) COPY_4UBV(a,b)
-#define SS_SPEC(a,b) COPY_4UBV(a,b)
+#define SS_COLOR(a,b) COPY_CHAN4(a,b)
+#define SS_SPEC(a,b) COPY_CHAN4(a,b)
 #define SS_IND(a,b) (a = b)
 
 #define IND (0)
diff --git a/src/mesa/swrast_setup/ss_vb.c b/src/mesa/swrast_setup/ss_vb.c
index 266a9dfca49..d69f0ed8fcd 100644
--- a/src/mesa/swrast_setup/ss_vb.c
+++ b/src/mesa/swrast_setup/ss_vb.c
@@ -26,6 +26,7 @@
  */
 
 #include "glheader.h"
+#include "colormac.h"
 #include "macros.h"
 
 #include "swrast/swrast.h"
@@ -201,7 +202,7 @@ rs_invalid( GLcontext *ctx, GLuint start, GLuint end, GLuint newinputs )
 void 
 _swsetup_vb_init( GLcontext *ctx )
 {
-   int i;
+   GLuint i;
    (void) ctx;
 
    for (i = 0 ; i < Elements(setup_func) ; i++)
diff --git a/src/mesa/swrast_setup/ss_vbtmp.h b/src/mesa/swrast_setup/ss_vbtmp.h
index 6197f5bdb56..8b6aaaecded 100644
--- a/src/mesa/swrast_setup/ss_vbtmp.h
+++ b/src/mesa/swrast_setup/ss_vbtmp.h
@@ -39,7 +39,7 @@ static void TAG(rs)(GLcontext *ctx, GLuint start, GLuint end, GLuint newinputs )
    GLfloat *fog;
    GLfloat *pointSize;
    GLuint tsz[MAX_TEXTURE_UNITS];
-   int i;
+   GLuint i;
    GLfloat *m = ctx->Viewport._WindowMap.m;
    const GLfloat sx = m[0];
    const GLfloat sy = m[5];
@@ -118,10 +118,10 @@ static void TAG(rs)(GLcontext *ctx, GLuint start, GLuint end, GLuint newinputs )
 	 }
 
 	 if (IND & COLOR)
-	    COPY_4UBV(v->color, color[i]);
+	    COPY_CHAN4(v->color, color[i]);
 	 
 	 if (IND & SPEC) 
-	    COPY_4UBV(v->specular, spec[i]);
+	    COPY_CHAN4(v->specular, spec[i]);
 
 	 if (IND & FOG)
 	    v->fog = fog[i];