summaryrefslogtreecommitdiff
path: root/src/glu/sgi/libnurbs/interface
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-07-16 15:46:42 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-07-16 15:46:42 +0000
commitfba5e9546874e1e140a3862b31e35b68832cc22d (patch)
treec540c6cee09570a153ee1e53e423fd0b27cbcba4 /src/glu/sgi/libnurbs/interface
parent96385fa15569e25cd0977e678c0ff3bdab6ef316 (diff)
assorted fixes for Win32 (Gerk Huisma)
Diffstat (limited to 'src/glu/sgi/libnurbs/interface')
-rw-r--r--src/glu/sgi/libnurbs/interface/glcurveval.h6
-rw-r--r--src/glu/sgi/libnurbs/interface/glinterface.cc10
-rw-r--r--src/glu/sgi/libnurbs/interface/glrenderer.h10
-rw-r--r--src/glu/sgi/libnurbs/interface/glsurfeval.cc6
-rw-r--r--src/glu/sgi/libnurbs/interface/glsurfeval.h6
5 files changed, 19 insertions, 19 deletions
diff --git a/src/glu/sgi/libnurbs/interface/glcurveval.h b/src/glu/sgi/libnurbs/interface/glcurveval.h
index c51700ea67..0ed91421e6 100644
--- a/src/glu/sgi/libnurbs/interface/glcurveval.h
+++ b/src/glu/sgi/libnurbs/interface/glcurveval.h
@@ -35,8 +35,8 @@
/*
* glcurveval.h
*
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
+ * $Date: 2001/07/16 15:46:42 $ $Revision: 1.2 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glcurveval.h,v 1.2 2001/07/16 15:46:42 brianp Exp $
*/
#ifndef __gluglcurveval_h_
@@ -93,7 +93,7 @@ public:
{
output_triangles = flag;
}
- void putCallBack(GLenum which, GLvoid (GLAPIENTRY *fn)(...));
+ void putCallBack(GLenum which, _GLUfuncptr fn );
void set_callback_userData(void *data)
{
userData = data;
diff --git a/src/glu/sgi/libnurbs/interface/glinterface.cc b/src/glu/sgi/libnurbs/interface/glinterface.cc
index f39a392176..dfd16d1722 100644
--- a/src/glu/sgi/libnurbs/interface/glinterface.cc
+++ b/src/glu/sgi/libnurbs/interface/glinterface.cc
@@ -31,10 +31,10 @@
** 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:40 $ $Revision: 1.1 $
+** $Date: 2001/07/16 15:46:42 $ $Revision: 1.2 $
*/
/*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glinterface.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
+** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glinterface.cc,v 1.2 2001/07/16 15:46:42 brianp Exp $
*/
#include "gluos.h"
@@ -429,7 +429,7 @@ gluGetNurbsProperty(GLUnurbs *r, GLenum property, GLfloat *value)
}
extern "C" void GLAPIENTRY
-gluNurbsCallback(GLUnurbs *r, GLenum which, GLvoid (*fn)())
+gluNurbsCallback(GLUnurbs *r, GLenum which, _GLUfuncptr fn )
{
switch (which) {
case GLU_NURBS_BEGIN:
@@ -444,11 +444,11 @@ gluNurbsCallback(GLUnurbs *r, GLenum which, GLvoid (*fn)())
case GLU_NURBS_NORMAL_DATA:
case GLU_NURBS_TEXTURE_COORD_DATA:
case GLU_NURBS_COLOR_DATA:
- r->putSurfCallBack(which, (GLvoid (*)(...))fn);
+ r->putSurfCallBack(which, fn);
break;
case GLU_NURBS_ERROR:
- r->errorCallback = (void (*)( GLenum )) fn;
+ r->errorCallback = (void (APIENTRY *)( GLenum e )) fn;
break;
default:
r->postError(GLU_INVALID_ENUM);
diff --git a/src/glu/sgi/libnurbs/interface/glrenderer.h b/src/glu/sgi/libnurbs/interface/glrenderer.h
index e74b8af9d9..12402a0ea5 100644
--- a/src/glu/sgi/libnurbs/interface/glrenderer.h
+++ b/src/glu/sgi/libnurbs/interface/glrenderer.h
@@ -35,8 +35,8 @@
/*
* glrenderer.h
*
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glrenderer.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
+ * $Date: 2001/07/16 15:46:42 $ $Revision: 1.2 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glrenderer.h,v 1.2 2001/07/16 15:46:42 brianp Exp $
*/
#ifndef __gluglrenderer_h_
@@ -70,11 +70,11 @@ public:
}
GLboolean getautoloadmode( void ) { return autoloadmode; }
- void (GLAPIENTRY *errorCallback)( GLenum );
+ void (APIENTRY *errorCallback)( GLenum );
void postError( int which )
- { if (errorCallback) (*errorCallback)( (GLenum)which ); }
+ { if (errorCallback) (errorCallback)( (GLenum)which ); }
- void putSurfCallBack(GLenum which, GLvoid (GLAPIENTRY *fn)(...))
+ void putSurfCallBack(GLenum which, _GLUfuncptr fn )
{
curveEvaluator.putCallBack(which, fn);
surfaceEvaluator.putCallBack(which, fn);
diff --git a/src/glu/sgi/libnurbs/interface/glsurfeval.cc b/src/glu/sgi/libnurbs/interface/glsurfeval.cc
index 2fe6ce01c7..3f6ff87942 100644
--- a/src/glu/sgi/libnurbs/interface/glsurfeval.cc
+++ b/src/glu/sgi/libnurbs/interface/glsurfeval.cc
@@ -35,8 +35,8 @@
/*
* glsurfeval.c++
*
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
+ * $Date: 2001/07/16 15:46:42 $ $Revision: 1.2 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.cc,v 1.2 2001/07/16 15:46:42 brianp Exp $
*/
/* Polynomial Evaluator Interface */
@@ -1188,7 +1188,7 @@ return;
}
void
-OpenGLSurfaceEvaluator::putCallBack(GLenum which, GLvoid (GLAPIENTRY *fn)(...))
+OpenGLSurfaceEvaluator::putCallBack(GLenum which, _GLUfuncptr fn )
{
switch(which)
{
diff --git a/src/glu/sgi/libnurbs/interface/glsurfeval.h b/src/glu/sgi/libnurbs/interface/glsurfeval.h
index c1b09fc436..b7fa4a0501 100644
--- a/src/glu/sgi/libnurbs/interface/glsurfeval.h
+++ b/src/glu/sgi/libnurbs/interface/glsurfeval.h
@@ -35,8 +35,8 @@
/*
* glsurfeval.h
*
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.h,v 1.1 2001/03/17 00:25:40 brianp Exp $
+ * $Date: 2001/07/16 15:46:42 $ $Revision: 1.2 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.h,v 1.2 2001/07/16 15:46:42 brianp Exp $
*/
#ifndef __gluglsurfeval_h_
@@ -145,7 +145,7 @@ public:
void newtmeshvert( REAL, REAL );
void newtmeshvert( long, long );
- void putCallBack(GLenum which, GLvoid (GLAPIENTRY *fn)(...));
+ void putCallBack(GLenum which, _GLUfuncptr fn );
int get_vertices_call_back()
{
return output_triangles;