From cfe52d8ae0b7ff16c9369787c149a78226aff06f Mon Sep 17 00:00:00 2001 From: Karl Schultz Date: Thu, 20 Sep 2001 21:50:53 +0000 Subject: [PATCH] Don't use "errno" as a parameter name - it is also a function and that confused the Windows compiler. Also make messages unsigned char for consistency. --- src/glu/sgi/libutil/glue.c | 16 ++++++++-------- src/glu/sgi/libutil/gluint.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/glu/sgi/libutil/glue.c b/src/glu/sgi/libutil/glue.c index a5fcb8dd496..cf418ea22e4 100644 --- a/src/glu/sgi/libutil/glue.c +++ b/src/glu/sgi/libutil/glue.c @@ -31,14 +31,14 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $ -** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libutil/glue.c,v 1.1 2001/03/17 00:25:41 brianp Exp $ +** $Date: 2001/09/20 21:50:53 $ $Revision: 1.2 $ +** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libutil/glue.c,v 1.2 2001/09/20 21:50:53 kschultz Exp $ */ #include #include "gluint.h" -static char *__gluNurbsErrors[] = { +static unsigned char *__gluNurbsErrors[] = { " ", "spline order un-supported", "too few knots", @@ -79,12 +79,12 @@ static char *__gluNurbsErrors[] = { "duplicate point on piecewise linear trimming curve", }; -const char *__gluNURBSErrorString( int errno ) +const unsigned char *__gluNURBSErrorString( int errnum ) { - return __gluNurbsErrors[errno]; + return __gluNurbsErrors[errnum]; } -static char *__gluTessErrors[] = { +static unsigned char *__gluTessErrors[] = { " ", "gluTessBeginPolygon() must precede a gluTessEndPolygon()", "gluTessBeginContour() must precede a gluTessEndContour()", @@ -94,7 +94,7 @@ static char *__gluTessErrors[] = { "need combine callback", }; -const char *__gluTessErrorString( int errno ) +const unsigned char *__gluTessErrorString( int errnum ) { - return __gluTessErrors[errno]; + return __gluTessErrors[errnum]; } /* __glTessErrorString() */ diff --git a/src/glu/sgi/libutil/gluint.h b/src/glu/sgi/libutil/gluint.h index c04c5acda0e..f08401df7ae 100644 --- a/src/glu/sgi/libutil/gluint.h +++ b/src/glu/sgi/libutil/gluint.h @@ -31,16 +31,16 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $ -** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libutil/gluint.h,v 1.1 2001/03/17 00:25:41 brianp Exp $ +** $Date: 2001/09/20 21:50:53 $ $Revision: 1.2 $ +** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libutil/gluint.h,v 1.2 2001/09/20 21:50:53 kschultz Exp $ */ #ifndef __gluint_h__ #define __gluint_h__ -extern const char *__gluNURBSErrorString( int errno ); +extern const unsigned char *__gluNURBSErrorString( int errnum ); -extern const char *__gluTessErrorString( int errno ); +extern const unsigned char *__gluTessErrorString( int errnum ); #ifdef _EXTENSIONS_ #define COS cosf -- 2.30.2