summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-02-26 14:58:11 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-02-26 14:58:11 +0000
commit4bd765d2e05a42ae9715a9656e9fcfe5c97a0a7f (patch)
tree32072de96fa7397ddce1910c07b378549b12e5ff
parentb4d83c4a02aaff4f2cd68d983f4e76a268684bfb (diff)
downloadglu-4bd765d2e05a42ae9715a9656e9fcfe5c97a0a7f.tar.gz
Fix C/C++ calling conventions problem (Bug 904854)
-rw-r--r--src/libnurbs/interface/glrenderer.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libnurbs/interface/glrenderer.h b/src/libnurbs/interface/glrenderer.h
index 8773afc..30f0763 100644
--- a/src/libnurbs/interface/glrenderer.h
+++ b/src/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