From 01915e90e6912f06d43d443a09157f7bbc96ddc5 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 8 Mar 2001 15:23:46 +0000
Subject: More g++ warning fixes.  Fixes for CHAN_BITS==16, it seems to work.

---
 src/mesa/drivers/x11/fakeglx.c | 4 ++--
 src/mesa/drivers/x11/xfonts.c  | 6 +++---
 src/mesa/drivers/x11/xm_api.c  | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/mesa/drivers/x11')

diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 4e5d5acd49..d3a36ec8f4 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,4 +1,4 @@
-/* $Id: fakeglx.c,v 1.46 2001/02/17 00:17:31 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.47 2001/03/08 15:23:46 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2206,7 +2206,7 @@ struct _glxapi_table *_mesa_GetGLXDispatchTable(void)
 
    /* be sure our dispatch table size <= libGL's table */
    {
-      int size = sizeof(struct _glxapi_table) / sizeof(void *);
+      GLuint size = sizeof(struct _glxapi_table) / sizeof(void *);
       (void) size;
       assert(_glxapi_get_dispatch_table_size() >= size);
    }
diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index 3bb27a0c53..22f941a490 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -1,4 +1,4 @@
-/* $Id: xfonts.c,v 1.12 2001/03/03 20:33:30 brianp Exp $ */
+/* $Id: xfonts.c,v 1.13 2001/03/08 15:23:46 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -180,10 +180,10 @@ fill_bitmap (Display *dpy, Window win, GC gc,
  * determine if a given glyph is valid and return the
  * corresponding XCharStruct.
  */
-static XCharStruct *isvalid(XFontStruct *fs, int which)
+static XCharStruct *isvalid(XFontStruct *fs, unsigned int which)
 {
   unsigned int  rows,pages;
-  int           byte1 = 0,byte2 = 0;
+  unsigned int byte1 = 0,byte2 = 0;
   int           i,valid = 1;
 
   rows = fs->max_byte1 - fs->min_byte1 + 1;
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 8e1bd87517..abbec2d7dd 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1,4 +1,4 @@
-/* $Id: xm_api.c,v 1.17 2001/03/03 20:33:30 brianp Exp $ */
+/* $Id: xm_api.c,v 1.18 2001/03/08 15:23:46 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2237,7 +2237,8 @@ GLboolean XMesaSetFXmode( GLint mode )
 static void FXgetImage( XMesaBuffer b )
 {
    static unsigned short pixbuf[MAX_WIDTH];
-   int x, y;
+   GLuint x, y;
+   int xpos, ypos;
    XMesaWindow root;
    unsigned int bw, depth, width, height;
    XMesaContext xmesa = (XMesaContext) b->xm_context->gl_ctx->DriverCtx;
@@ -2252,7 +2253,7 @@ static void FXgetImage( XMesaBuffer b )
    depth = b->frontbuffer->depth;
 #else
    XGetGeometry( xmesa->xm_visual->display, b->frontbuffer,
-                 &root, &x, &y, &width, &height, &bw, &depth);
+                 &root, &xpos, &ypos, &width, &height, &bw, &depth);
 #endif
    if (b->width != width || b->height != height) {
       b->width = MIN2((int)width, xmesa->xm_buffer->FXctx->width);
-- 
cgit v1.2.3