From c8957aa89612d7f73d16b0884aa588574ffd9377 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 26 Feb 2004 14:58:11 +0000 Subject: Fix C/C++ calling conventions problem (Bug 904854) --- src/glu/sgi/libnurbs/interface/glrenderer.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/glu/sgi/libnurbs/interface/glrenderer.h b/src/glu/sgi/libnurbs/interface/glrenderer.h index 8773afcda30..30f07632a48 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/08/07 17:34:11 $ $Revision: 1.3 $ - * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glrenderer.h,v 1.3 2001/08/07 17:34:11 brianp Exp $ + * $Date: 2004/02/26 14:58:11 $ $Revision: 1.4 $ + * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/glrenderer.h,v 1.4 2004/02/26 14:58:11 brianp Exp $ */ #ifndef __gluglrenderer_h_ @@ -48,6 +48,10 @@ #include "glsurfeval.h" #include "glcurveval.h" +extern "C" { + typedef void (APIENTRY *errorCallbackType)( GLenum ); +} + class GLUnurbs : public NurbsTessellator { public: @@ -70,7 +74,7 @@ public: } GLboolean getautoloadmode( void ) { return autoloadmode; } - void (APIENTRY *errorCallback)( GLenum ); + errorCallbackType errorCallback; void postError( int which ) { if (errorCallback) (errorCallback)( (GLenum)which ); } #ifdef _WIN32 -- cgit v1.2.3