From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 23 Apr 2004 14:14:04 +0000 (+0000)
Subject: assorted fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=384800fe12e368f3489111de4572dbc8846a7dea;p=mesa.git

assorted fixes
---

diff --git a/progs/tests/Makefile b/progs/tests/Makefile
index 9f1e3cc9eb4..28f7a50ee64 100644
--- a/progs/tests/Makefile
+++ b/progs/tests/Makefile
@@ -34,7 +34,6 @@ SOURCES = antialias.c \
 	seccolor.c \
 	sharedtex.c \
 	stencilwrap.c \
-	swaplock.c \
 	tex1d.c \
 	texline.c \
 	texrect.c \
diff --git a/progs/tests/stencilwrap.c b/progs/tests/stencilwrap.c
index f7d3ecd38da..8e4475316de 100644
--- a/progs/tests/stencilwrap.c
+++ b/progs/tests/stencilwrap.c
@@ -164,7 +164,7 @@ static void Init( void )
     */
 
    ver_str = glGetString( GL_VERSION );
-   version = (ver_str == NULL) ? 1.0 : strtof( ver_str, NULL );
+   version = (ver_str == NULL) ? 1.0 : atof( ver_str );
 
    if ( !glutExtensionSupported("GL_EXT_stencil_wrap")
 	&& (version < 1.4) ) {
diff --git a/progs/tests/yuvrect.c b/progs/tests/yuvrect.c
index 509c0433b91..acef4060970 100644
--- a/progs/tests/yuvrect.c
+++ b/progs/tests/yuvrect.c
@@ -18,7 +18,6 @@
 
 static GLfloat Xrot = 0, Yrot = 0, Zrot = 0;
 static GLint ImgWidth, ImgHeight;
-static GLenum ImgFormat;
 static GLushort *ImageYUV = NULL;
 
 
diff --git a/progs/tests/yuvsquare.c b/progs/tests/yuvsquare.c
index 494586776a0..3601e7a31c7 100644
--- a/progs/tests/yuvsquare.c
+++ b/progs/tests/yuvsquare.c
@@ -128,7 +128,6 @@ static void SpecialKey( int key, int x, int y )
 static void Init( int argc, char *argv[] )
 {
    const char *file;
-   int error;
    GLenum  format;
 
    if (!glutExtensionSupported("GL_MESA_ycbcr_texture")) {