summaryrefslogtreecommitdiffstats
path: root/progs/xdemos
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2004-09-16 19:40:22 +0000
committerBrian Paul <[email protected]>2004-09-16 19:40:22 +0000
commita511b70f44378368ebf0db5479b66a82dee2ca4f (patch)
tree40696bbc58843ba89880dbbfca0e492f7a356e85 /progs/xdemos
parent37c0497d98fce307d5c5f996366f068c6d7d1551 (diff)
silence warnings
Diffstat (limited to 'progs/xdemos')
-rw-r--r--progs/xdemos/glxheads.c2
-rw-r--r--progs/xdemos/glxswapcontrol.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/progs/xdemos/glxheads.c b/progs/xdemos/glxheads.c
index b1e2be87763..0145a70e91c 100644
--- a/progs/xdemos/glxheads.c
+++ b/progs/xdemos/glxheads.c
@@ -247,7 +247,7 @@ static void
PrintInfo(const struct head *h)
{
printf("Name: %s\n", h->DisplayName);
- printf(" Display: %p\n", h->Dpy);
+ printf(" Display: %p\n", (void *) h->Dpy);
printf(" Window: 0x%x\n", (int) h->Win);
printf(" Context: 0x%lx\n", (long) h->Context);
printf(" GL_VERSION: %s\n", h->Version);
diff --git a/progs/xdemos/glxswapcontrol.c b/progs/xdemos/glxswapcontrol.c
index 98b3d1b58f1..0ed5ebe4722 100644
--- a/progs/xdemos/glxswapcontrol.c
+++ b/progs/xdemos/glxswapcontrol.c
@@ -576,7 +576,7 @@ event_loop(Display *dpy, Window win)
static void
show_refresh_rate( Display * dpy )
{
-#if defined(GLX_OML_sync_control) && (__STDC_VERSION__ >= 199901L)
+#if defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
PFNGLXGETMSCRATEOMLPROC get_msc_rate;
int32_t n;
int32_t d;