diff options
author | Brian Paul <[email protected]> | 2001-07-16 15:46:42 +0000 |
---|---|---|
committer | Brian Paul <[email protected]> | 2001-07-16 15:46:42 +0000 |
commit | fba5e9546874e1e140a3862b31e35b68832cc22d (patch) | |
tree | c540c6cee09570a153ee1e53e423fd0b27cbcba4 /src/glu/sgi/libnurbs/interface/glinterface.cc | |
parent | 96385fa15569e25cd0977e678c0ff3bdab6ef316 (diff) |
assorted fixes for Win32 (Gerk Huisma)
Diffstat (limited to 'src/glu/sgi/libnurbs/interface/glinterface.cc')
-rw-r--r-- | src/glu/sgi/libnurbs/interface/glinterface.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/glu/sgi/libnurbs/interface/glinterface.cc b/src/glu/sgi/libnurbs/interface/glinterface.cc index f39a3921767..dfd16d17222 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); |