summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2003-04-21 14:51:16 +0000
committerBrian Paul <[email protected]>2003-04-21 14:51:16 +0000
commitd93b68f17aa4bc980fcda57e8efe29a831a44cdc (patch)
treee325e2b7db956eee0c547f843ea157921e49165d
parentff389b00a5b76e93308163fcb858913d8594af80 (diff)
silence warnings
-rw-r--r--progs/xdemos/glxheads.c6
-rw-r--r--progs/xdemos/manywin.c4
-rw-r--r--progs/xdemos/pbinfo.c3
3 files changed, 6 insertions, 7 deletions
diff --git a/progs/xdemos/glxheads.c b/progs/xdemos/glxheads.c
index 605ccc38584..428576d9d9c 100644
--- a/progs/xdemos/glxheads.c
+++ b/progs/xdemos/glxheads.c
@@ -1,4 +1,4 @@
-/* $Id: glxheads.c,v 1.3 2002/03/08 19:44:28 brianp Exp $ */
+/* $Id: glxheads.c,v 1.4 2003/04/21 14:51:16 brianp Exp $ */
/*
* Exercise multiple GLX connections on multiple X displays.
@@ -248,9 +248,9 @@ static void
PrintInfo(const struct head *h)
{
printf("Name: %s\n", h->DisplayName);
- printf(" Display: 0x%x\n", (int) h->Dpy);
+ printf(" Display: %p\n", h->Dpy);
printf(" Window: 0x%x\n", (int) h->Win);
- printf(" Context: 0x%x\n", (int) h->Context);
+ printf(" Context: 0x%lx\n", (long) 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/manywin.c b/progs/xdemos/manywin.c
index 2a28bc326b2..a0286bdbcb5 100644
--- a/progs/xdemos/manywin.c
+++ b/progs/xdemos/manywin.c
@@ -1,5 +1,3 @@
-/* $Id: manywin.c,v 1.5 2001/11/26 17:21:46 brianp Exp $ */
-
/*
* Create N GLX windows/contexts and render to them in round-robin
* order.
@@ -284,7 +282,7 @@ PrintInfo(const struct head *h)
printf("Name: %s\n", h->DisplayName);
printf(" Display: %p\n", (void *) h->Dpy);
printf(" Window: 0x%x\n", (int) h->Win);
- printf(" Context: 0x%x\n", (int) h->Context);
+ printf(" Context: 0x%lx\n", (long) 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/pbinfo.c b/progs/xdemos/pbinfo.c
index e4e52810f77..f0b2f0eed4c 100644
--- a/progs/xdemos/pbinfo.c
+++ b/progs/xdemos/pbinfo.c
@@ -1,4 +1,4 @@
-/* $Id: pbinfo.c,v 1.1 2002/10/05 18:30:13 brianp Exp $ */
+/* $Id: pbinfo.c,v 1.2 2003/04/21 14:51:16 brianp Exp $ */
/*
* Print list of fbconfigs and test each to see if a pbuffer can be created
@@ -49,6 +49,7 @@ PrintConfigs(Display *dpy, int screen, Bool horizFormat)
fbConfigs = glXChooseFBConfigSGIX(dpy, screen, fbAttribs, &nConfigs);
#else
/* GLX 1.3 method */
+ (void) fbAttribs;
fbConfigs = glXGetFBConfigs(dpy, screen, &nConfigs);
#endif