fix some minor warnings

diff --git a/progs/xdemos/glthreads.c b/progs/xdemos/glthreads.c
index 128c6cc..91fca3d 100644 (file)
--- a/progs/xdemos/glthreads.c
+++ b/progs/xdemos/glthreads.c
@@ -1,4 +1,4 @@
-/* $Id: glthreads.c,v 1.1 2000/07/20 20:12:17 brianp Exp $ */
+/* $Id: glthreads.c,v 1.2 2002/03/08 19:44:28 brianp Exp $ */
 
 /*
  * Copyright (C) 2000  Brian Paul   All Rights Reserved.
@@ -38,6 +38,7 @@
 #include <GL/glx.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <pthread.h>
 

diff --git a/progs/xdemos/glxheads.c b/progs/xdemos/glxheads.c
index 42bfc83..605ccc3 100644 (file)
--- a/progs/xdemos/glxheads.c
+++ b/progs/xdemos/glxheads.c
@@ -1,4 +1,4 @@
-/* $Id: glxheads.c,v 1.2 2000/11/10 17:23:07 brianp Exp $ */
+/* $Id: glxheads.c,v 1.3 2002/03/08 19:44:28 brianp Exp $ */
 
 /*
  * Exercise multiple GLX connections on multiple X displays.
@@ -30,6 +30,7 @@
 #include <GL/glx.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 
@@ -247,9 +248,9 @@ static void
 PrintInfo(const struct head *h)
 {
    printf("Name: %s\n", h->DisplayName);
-   printf("  Display:     0x%x\n", h->Dpy);
-   printf("  Window:      0x%x\n", h->Win);
-   printf("  Context:     0x%x\n", h->Context);
+   printf("  Display:     0x%x\n", (int) h->Dpy);
+   printf("  Window:      0x%x\n", (int) h->Win);
+   printf("  Context:     0x%x\n", (int) h->Context);
    printf("  GL_VERSION:  %s\n", h->Version);
    printf("  GL_VENDOR:   %s\n", h->Vendor);
    printf("  GL_RENDERER: %s\n", h->Renderer);

diff --git a/progs/xdemos/glxinfo.c b/progs/xdemos/glxinfo.c
index 58baf82..00b4f04 100644 (file)
--- a/progs/xdemos/glxinfo.c
+++ b/progs/xdemos/glxinfo.c
@@ -1,4 +1,4 @@
-/* $Id: glxinfo.c,v 1.14 2001/04/24 20:57:36 brianp Exp $ */
+/* $Id: glxinfo.c,v 1.15 2002/03/08 19:44:28 brianp Exp $ */
 
 /*
  * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
@@ -408,7 +408,7 @@ print_visual_attribs_short_header(void)
 static void
 print_visual_attribs_short(const struct visual_attribs *attribs)
 {
-   char *caveat;
+   char *caveat = NULL;
 #ifdef GLX_EXT_visual_rating
    if (attribs->visualCaveat == GLX_NONE_EXT || attribs->visualCaveat == 0)
       caveat = "None";