silence warnings

diff --git a/progs/xdemos/glxheads.c b/progs/xdemos/glxheads.c
index b1e2be8..0145a70 100644 (file)
--- 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 98b3d1b..0ed5ebe 100644 (file)
--- 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;