diff options
Diffstat (limited to 'xc/extras/ogl-sample/main')
6 files changed, 21 insertions, 5 deletions
diff --git a/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc b/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc index 9d0b290b3..6010521e1 100755 --- a/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc +++ b/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc @@ -31,10 +31,15 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** +** Date Revision */ /* +** Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc#3 */ + +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc,v 1.2 2002/01/23 17:06:18 dawes Exp $ */ + #include <stdlib.h> #include <stdio.h> @@ -75,3 +80,12 @@ void quicksort(void *v[], int left, int right, quicksort(v, left, last-1, comp); quicksort(v, last+1, right, comp); } + +static void swap(void *v[], int i, int j) +{ + void *temp; + temp = v[i]; + v[i] = v[j]; + v[j] = temp; +} + diff --git a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.c b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.c index df116de3b..1c5976505 100755 --- a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.c +++ b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.c,v 1.2 2001/10/28 03:32:22 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.c,v 1.3 2002/02/22 21:32:49 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 diff --git a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.c b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.c index 1e49a5800..c4bf4e616 100755 --- a/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.c +++ b/xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.c @@ -36,7 +36,7 @@ ** Author: Eric Veach, July 1994. ** */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.c,v 1.2 2001/10/28 03:32:22 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.c,v 1.3 2002/02/22 21:32:49 dawes Exp $ */ #include "gluos.h" #include <assert.h> diff --git a/xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c b/xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c index d8dfd2ea2..f82ebb1bb 100755 --- a/xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c +++ b/xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c @@ -32,7 +32,7 @@ ** compliant with the OpenGL(R) version 1.2.1 Specification. ** */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c,v 1.4 2001/10/28 03:32:23 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c,v 1.5 2002/02/22 21:32:49 dawes Exp $ */ #include "gluos.h" #include <assert.h> diff --git a/xc/extras/ogl-sample/main/gfx/lib/glu/libutil/project.c b/xc/extras/ogl-sample/main/gfx/lib/glu/libutil/project.c index fb65e0f17..06958c37d 100755 --- a/xc/extras/ogl-sample/main/gfx/lib/glu/libutil/project.c +++ b/xc/extras/ogl-sample/main/gfx/lib/glu/libutil/project.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/project.c,v 1.2 2001/10/28 03:32:24 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/project.c,v 1.3 2002/02/22 21:32:49 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 diff --git a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.h b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.h index 5789b8e39..d8f8ffefc 100755 --- a/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.h +++ b/xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.h @@ -39,7 +39,7 @@ ** tree and for generating both Motif(TM) 1.2 and 2.x versions of the widgets ** in the same library. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.h,v 1.3 2001/05/02 13:37:45 dawes Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glw/GLwDrawA.h,v 1.4 2002/05/31 16:36:50 dawes Exp $ */ #ifndef _GLwDrawA_h #define _GLwDrawA_h @@ -151,6 +151,7 @@ # define _GLwMDrawingAreaRec _GLwM1DrawingAreaRec */ # define glwMDrawingAreaWidgetClass glwM1DrawingAreaWidgetClass +# define glwMDrawingAreaClassRec glwM1DrawingAreaClassRec # define GLwCreateMDrawingArea GLwCreateM1DrawingArea #elif XmVERSION == 2 /* @@ -158,6 +159,7 @@ # define _GLwMDrawingAreaRec _GLwM2DrawingAreaRec */ # define glwMDrawingAreaWidgetClass glwM2DrawingAreaWidgetClass +# define glwMDrawingAreaClassRec glwM2DrawingAreaClassRec # define GLwCreateMDrawingArea GLwCreateM2DrawingArea #else #error "Sorry, unknown Motif version." |