silence compiler warnings

diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index 9ca044d0a58b53b30b5649ac4ae14ab63ef71933..72f2a4538b70bd8428b6d1288d30232ffad579c0 100644 (file)
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -388,7 +388,7 @@ fxMesaCreateContext(GLuint win,
 
 
    fxMesa->glideContext = FX_grSstWinOpen((FxU32) win, res, ref,
-#if  FXMESA_USE_ARGB
+#ifdef  FXMESA_USE_ARGB
                                          GR_COLORFORMAT_ARGB,
 #else
                                          GR_COLORFORMAT_ABGR,
@@ -403,7 +403,7 @@ fxMesaCreateContext(GLuint win,
     * Pixel tables are use during pixel read-back
     * Either initialize them for RGB or BGR order.
     */
-#if FXMESA_USE_ARGB
+#ifdef FXMESA_USE_ARGB
    useBGR = GL_FALSE;          /* Force RGB pixel order */
    system = "FXMESA_USE_ARGB";
 #else

diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index d389124ff570fcd4e65caad2e4821cc5bbfed147..c129978f769f24fbbc1a7c2ad6f0db8e901592d6 100644 (file)
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -748,7 +748,7 @@ fxDDInitFxMesaContext(fxMesaContext fxMesa)
    if (fxMesa->haveZBuffer)
       FX_grDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER);
 
-#if (!FXMESA_USE_ARGB)
+#ifndef FXMESA_USE_ARGB
    FX_grLfbWriteColorFormat(GR_COLORFORMAT_ABGR);      /* Not every Glide has this */
 #endif
 

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index d727a118c2da0c6db0df6c6e570fc147d0896ce6..06b4dc21f7ac9a13dd1c9502a11829131820ef4d 100644 (file)
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.67 2001/03/12 00:48:37 gareth Exp $ */
+/* $Id: dlist.c,v 1.68 2001/03/27 16:42:37 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -3228,7 +3228,7 @@ static void save_TexImage2D( GLenum target,
 
 
 static void save_TexImage3D( GLenum target,
-                             GLint level, GLint internalFormat,
+                             GLint level, GLenum internalFormat,
                              GLsizei width, GLsizei height, GLsizei depth,
                              GLint border,
                              GLenum format, GLenum type,
@@ -3249,7 +3249,7 @@ static void save_TexImage3D( GLenum target,
       if (n) {
          n[1].e = target;
          n[2].i = level;
-         n[3].i = internalFormat;
+         n[3].i = (GLint) internalFormat;
          n[4].i = (GLint) width;
          n[5].i = (GLint) height;
          n[6].i = (GLint) depth;