don't pass GL_INTENSITY for <format> to glTexImage2D - it's illegal

[mesa.git] / progs / demos / ipers.c

diff --git a/progs/demos/ipers.c b/progs/demos/ipers.c
index 029de000898b5722b01a9932875b1b9e2d724be9..d43c662234e475444e842364b99223d798c3e90a 100644 (file)
--- a/progs/demos/ipers.c
+++ b/progs/demos/ipers.c
@@ -11,7 +11,7 @@
 #include <math.h>
 #include <time.h>
 
-#ifdef WIN32
+#if defined (WIN32)|| defined(_WIN32)
 #include <windows.h>
 #include <mmsystem.h>
 #endif
@@ -186,7 +186,7 @@ inittextures(void)
        (gluerr =
        gluBuild2DMipmaps(GL_TEXTURE_2D, 3, TEX_SKY_WIDTH, TEX_SKY_HEIGHT,
                          GL_RGB, GL_UNSIGNED_BYTE, (GLvoid *) (tsky)))) {
-      fprintf(stderr, "GLULib%s\n", gluErrorString(gluerr));
+      fprintf(stderr, "GLULib%s\n", (char *) gluErrorString(gluerr));
       exit(-1);
    }
 
@@ -357,7 +357,7 @@ printhelp(void)
    printstring(GLUT_BITMAP_TIMES_ROMAN_24, "p - Toggle Wire frame");
    glRasterPos2i(60, 150);
    printstring(GLUT_BITMAP_TIMES_ROMAN_24,
-              "b - Toggle GL_EXT_rescale_normal extension");
+              "n - Toggle GL_EXT_rescale_normal extension");
    glRasterPos2i(60, 120);
    printstring(GLUT_BITMAP_TIMES_ROMAN_24,
               "+/- - Increase/decrease the Object maximum LOD");