diff options
Diffstat (limited to 'xc/extras/ogl-sample/main/gfx/lib/glu/libtess')
4 files changed, 11 insertions, 12 deletions
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h index 1e4909740..543913209 100755 --- a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h +++ b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h,v 1.2 2001/03/02 03:42:45 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -35,14 +36,14 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date: 2001/03/19 17:45:28 $ $Revision: 1.1.1.1 $ -** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/Attic/memalloc.h,v 1.1.1.1 2001/03/19 17:45:28 dawes Exp $ +** $Date: 2001/04/09 16:27:24 $ $Revision: 1.1.1.2 $ +** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/Attic/memalloc.h,v 1.1.1.2 2001/04/09 16:27:24 dawes Exp $ */ #ifndef __memalloc_simple_h_ #define __memalloc_simple_h_ -#include <malloc.h> +#include <stdlib.h> #define memRealloc realloc #define memFree free diff --git a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c index 74cdb4e35..44a9b02cb 100755 --- a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c +++ b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c @@ -35,9 +35,8 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date: 2001/03/19 17:45:28 $ $Revision: 1.1.1.1 $ -** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/Attic/tess.c,v 1.1.1.1 2001/03/19 17:45:28 dawes Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.c,v 1.2 2001/04/03 02:18:40 dawes Exp $ */ #include "gluos.h" #include <stddef.h> @@ -271,7 +270,8 @@ gluTessNormal( GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z ) } void GLAPIENTRY -gluTessCallback( GLUtesselator *tess, GLenum which, void (GLAPIENTRY *fn)()) +gluTessCallback( GLUtesselator *tess, GLenum which, + GLvoid (GLAPIENTRY *fn)(GLvoid)) { switch( which ) { case GLU_TESS_BEGIN: diff --git a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tessmono.c b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tessmono.c index ba81a6eb6..b29f6027d 100755 --- a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tessmono.c +++ b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tessmono.c @@ -35,9 +35,8 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date: 2001/03/19 17:45:28 $ $Revision: 1.1.1.1 $ -** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/Attic/tessmono.c,v 1.1.1.1 2001/03/19 17:45:28 dawes Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tessmono.c,v 1.2 2001/04/03 02:18:40 dawes Exp $ */ #include "gluos.h" #include <stdlib.h> @@ -50,7 +49,7 @@ eDst->Sym->winding += eSrc->Sym->winding) /* __gl_meshTessellateMonoRegion( face ) tessellates a monotone region - * (what else would it do??) The region must consist of a single + * (what else would it do?) The region must consist of a single * loop of half-edges (see mesh.h) oriented CCW. "Monotone" in this * case means that any vertical line intersects the interior of the * region in a single interval. diff --git a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tessmono.h b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tessmono.h index 579c28bdd..200d9c865 100755 --- a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tessmono.h +++ b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tessmono.h @@ -35,15 +35,14 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date: 2001/03/19 17:45:28 $ $Revision: 1.1.1.1 $ -** $Header: /home/ajax/dri-backup/xc/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/Attic/tessmono.h,v 1.1.1.1 2001/03/19 17:45:28 dawes Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tessmono.h,v 1.2 2001/04/03 02:18:40 dawes Exp $ */ #ifndef __tessmono_h_ #define __tessmono_h_ /* __gl_meshTessellateMonoRegion( face ) tessellates a monotone region - * (what else would it do??) The region must consist of a single + * (what else would it do?) The region must consist of a single * loop of half-edges (see mesh.h) oriented CCW. "Monotone" in this * case means that any vertical line intersects the interior of the * region in a single interval. |